From 57e765464622357c85b6b37a381ec7d9db5ab02f Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Fri, 15 Nov 2024 08:49:06 +0800
Subject: [PATCH] 11.15

---
 .../dai_yunyingfenxi/tab/paytype.vue          |  2 +-
 .../jiaoyiduizhang/tab/int.vue                | 43 ++++++++--------
 .../yunyingfenxi/tab/int.vue                  |  2 +-
 .../yunyingfenxi/tab/oil.vue                  |  2 +-
 .../yunyingfenxi/tab/store.vue                | 14 ++---
 .../order/mapper/OrderGoodsMapper.java        | 12 +++--
 .../order/mapper/xml/LJOrderMapper.xml        | 13 +++--
 .../order/mapper/xml/OrderGoodsMapper.xml     | 51 ++++++++++++++++---
 .../service/impl/LJOrderServiceImpl.java      |  8 +--
 .../service/impl/OilOrderServiceImpl.java     |  8 +++
 10 files changed, 104 insertions(+), 51 deletions(-)

diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 27382e8cb..cc1892bce 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -198,7 +198,7 @@ export default {
         start.setMinutes(0)
         start.setSeconds(0)
         start.setMilliseconds(0)
-        this.value2 = [start, new Date()];
+        this.value2 = [parseTime(start),parseTime(new Date())];
       } else if (this.timeList[index] == '近一周') {
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
index 593f50bca..68377980a 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -7,20 +7,20 @@
           <el-select
             v-model="queryParams.deptId"
             clearable
-            placeholder="所属机构"
+            placeholder="请选择所属机构"
           >
             <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
             </el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="" style="width: 180px">-->
-<!--          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>-->
-<!--        </el-form-item>-->
+        <el-form-item label="" style="width: 180px">
+          <el-input placeholder="请输入商品名称" v-model="queryParams.giftName"></el-input>
+        </el-form-item>
         <el-form-item label="" prop="payChannel" style="width: 180px">
           <el-select
             v-model="queryParams.orderType"
             clearable
-            placeholder="订单类型"
+            placeholder="请选择订单类型"
           >
             <el-option label="商城兑换" value="0"/>
             <el-option label="收银台兑换" value="1"/>
@@ -30,7 +30,7 @@
           <el-select
             v-model="queryParams.paymentType"
             clearable
-            placeholder="支付方式"
+            placeholder="请选择支付方式"
           >
             <el-option label="现金" value="CASH"/>
             <el-option label="微信" value="WECHAT"/>
@@ -42,11 +42,11 @@
           <el-select
             v-model="queryParams.status"
             clearable
-            placeholder="订单状态"
+            placeholder="请选择订单状态"
           >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
+            <el-option label="支付支付" value="paid"/>
+            <el-option label="支付失败" value="unpaid"/>
+            <el-option label="退款成功" value="refund"/>
           </el-select>
         </el-form-item>
         <el-form-item label="">
@@ -82,12 +82,12 @@
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
           <el-table-column prop="orderNumber" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额（元）">
+          <!-- <el-table-column prop="amount" align="center" label="订单金额（元）">
             <template slot-scope="scope">
               <span v-if="scope.row.amount">{{scope.row.amount}}</span>
               <span v-else>--</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="payChannel" align="center" label="订单类型">
             <template slot-scope="scope">
               <span v-if="scope.row.orderType=='1'">收银台兑换</span>
@@ -112,20 +112,20 @@
           </el-table-column>
           <el-table-column align="center" label="消费信息">
             <el-table-column prop="giftName" align="center" label="商品名称" > </el-table-column>
-            <el-table-column prop="integral" align="center" label="消耗积分" > </el-table-column>
             <el-table-column prop="exchangeQuantity" align="center" label="数量" > </el-table-column>
+            <el-table-column prop="integral" align="center" label="消耗积分" > </el-table-column>
+            <el-table-column prop="amount" align="center" label="实付金额（元）">
+              <template slot-scope="scope">
+                <span v-if="scope.row.amount">{{scope.row.amount}}</span>
+                <span v-else>0</span>
+              </template>
+            </el-table-column>
           </el-table-column>
           <el-table-column prop="mchntCd" align="center" label="支付通道">
           </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
+          <el-table-column prop="paymentChannel" align="center" label="商户号编号" width="150"> </el-table-column>
           <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
-<!--          <el-table-column prop="payTime" align="center" label="订单完成时间" >-->
-<!--            <template slot-scope="scope">-->
-<!--              <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>-->
-<!--              <span v-else>&#45;&#45;</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-
+          <el-table-column prop="updateTime" align="center" label="订单完成时间" ></el-table-column>
         </el-table>
       </div>
       <pagination
@@ -175,6 +175,7 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
         queryParams: {
           page: 1,
           pageSize: 10,
+          giftName: '',
           beginTime:"",
           endTime:"",
           orderNo:"",
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index f809ec74e..3d3f2c56b 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -196,7 +196,7 @@ export default {
         start.setMinutes(0)
         start.setSeconds(0)
         start.setMilliseconds(0)
-        this.value2 = [start,new Date()];
+        this.value2 = [parseTime(start),parseTime(new Date())];
       } else if (this.timeList[index]=='近一周'){
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 45b4753ea..f3fa792d7 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -233,7 +233,7 @@ import {parseTime} from "@/utils/fuint";
           start.setMinutes(0)
           start.setSeconds(0)
           start.setMilliseconds(0)
-          this.value2 = [start,new Date()];
+          this.value2 = [parseTime(start),parseTime(new Date())];
         } else if (this.timeList[index]=='近一周'){
           let nowDate = new Date();
           let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 0d23a6429..409fccf12 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -74,7 +74,7 @@
             <el-table-column prop="counts" label="累计交易笔数"  align="center"></el-table-column>
             <el-table-column prop="goodsNums" label="累计销售商品数量"  align="center"></el-table-column>
             <el-table-column label="商品信息" align="center">
-                  <el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
+                  <el-table-column prop="cvsNum" label="品类数量" width="100" align="center"></el-table-column>
                   <el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
                   <el-table-column prop="payAmounts" label="累计交易金额 (元)" width="150" align="center">
                     <template slot-scope="scope">
@@ -86,18 +86,20 @@
             <el-table-column label="热销品类信息" align="center">
 
                   <el-table-column prop="cvgName" label="品类名称" width="100" align="center"></el-table-column>
-                  <el-table-column prop="cvgNum" label="销售数量 (件)" width="100" align="center"></el-table-column>
-                  <el-table-column prop="cvgAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
+                  <el-table-column prop="cvgNumber" label="销售数量 (件)" width="100" align="center"></el-table-column>
+                  <el-table-column prop="cvsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
 
             </el-table-column>
             <el-table-column label="热销商品信息" align="center">
                   <el-table-column prop="goodsName" label="商品名称" width="100" align="center"></el-table-column>
-                  <el-table-column prop="goodsNum" label="销售数量" width="100" align="center"></el-table-column>
+                  <el-table-column prop="goodsNumber" label="销售数量" width="100" align="center"></el-table-column>
                   <el-table-column prop="goodsAmount" label="销售金额 (元)" width="100" align="center"></el-table-column>
   <!--                <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
             </el-table-column>
             <el-table-column prop="statDate" label="统计日期" width="200" align="center">
-
+              <template>
+                {{this.value2[0]}} 至 {{this.value2[1]}}
+              </template>
             </el-table-column>
 
           </el-table>
@@ -210,7 +212,7 @@ import {parseTime} from "@/utils/fuint";
           start.setMinutes(0)
           start.setSeconds(0)
           start.setMilliseconds(0)
-          this.value2 = [start,new Date()];
+          this.value2 = [parseTime(start),parseTime(new Date())];
         } else if (this.timeList[index]=='近一周'){
           let nowDate = new Date();
           let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java
index ad74fb830..35639b75c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java
@@ -38,12 +38,16 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsVO> selectGoodsSalesRankYestoday(int i);
 
     OrderGoodsVO selectInfoByStoreId(LJOrderVo record);
-    OrderGoodsVO selectInfoByStoreId1(LJOrderVo record);
-    OrderGoodsVO selectInfoByStoreId2(LJOrderVo record);
+    // OrderGoodsVO selectInfoByStoreId1(LJOrderVo record);
+    OrderGoodsVO selectInfoByStoreId1(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
+    // OrderGoodsVO selectInfoByStoreId2(LJOrderVo record);
+    OrderGoodsVO selectInfoByStoreId2(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
     // 热销品类
-    OrderGoodsVO selectInfoByStoreIdType(LJOrderVo record);
+    // OrderGoodsVO selectInfoByStoreIdType(LJOrderVo record);
+    OrderGoodsVO selectInfoByStoreIdType(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
     // 热销商品
-    OrderGoodsVO selectInfoByStoreIdGoods(LJOrderVo record);
+    // OrderGoodsVO selectInfoByStoreIdGoods(LJOrderVo record);
+    OrderGoodsVO selectInfoByStoreIdGoods(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
 
     Map<Object,Object> selectOrderByBuySum( @Param("order") LJOrderVo order);
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index 0682b4b28..a43e728d3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -302,8 +302,9 @@
             sum(goods_num) goodsNums
         from mt_order
         <where>
+            status = 'paid'
             <if test="order.storeIds != null">
-                store_id in
+                and store_id in
                 <foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -325,8 +326,9 @@
             sum(goods_num) goodsNum
         from mt_order
         <where>
+            status = 'paid'
             <if test="order.storeIds != null">
-                store_id in
+                and store_id in
                 <foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -344,11 +346,12 @@
         select
             count(distinct mg.cvs_good_id) cvg
         from mt_order mo
-        left join mt_order_goods mog on mog.goods_id = mo.id
-        left join mt_goods mg on mog.goods_id = mg.id
+        left join mt_order_goods mog on mog.order_id = mo.id
+        left join mt_goods mg on mg.id = mog.goods_id
         <where>
+            mo.status = 'paid'
             <if test="order.storeIds != null">
-                mo.store_id in
+                and mo.store_id in
                 <foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
index 6e243bb01..6ddbd0169 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
@@ -44,15 +44,34 @@
 
     </select>
     <select id="selectInfoByStoreId1" resultType="com.fuint.business.largeSscreen.vo.OrderGoodsVO">
-
-select count(*) cvsNum
-from cvs_goods where store_id = #{storeId}
+        select count(distinct mg.cvs_good_id) cvsNum
+        from mt_order_goods mog
+            left join mt_order mo on mo.id = mog.order_id
+            left join mt_goods mg on mg.id = mog.goods_id
+        <where>
+            mo.store_id = #{record.storeId}
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(mog.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(mog.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
     </select>
     <select id="selectInfoByStoreId2" resultType="com.fuint.business.largeSscreen.vo.OrderGoodsVO">
 
-        select count(*) goodsNum
-        from cvs_goods where  store_id = #{storeId}
-
+        select count(distinct mog.goods_id) goodsNum
+        from mt_order_goods mog
+        left join mt_order mo on mo.id = mog.order_id
+        <where>
+            mo.store_id = #{record.storeId}
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(mog.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(mog.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
     </select>
     <select id="selectInfoByStoreIdType" resultType="com.fuint.business.largeSscreen.vo.OrderGoodsVO">
         SELECT cg.name cvgName, SUM(mog.num) cvgNumber,sum(mog.pay_amount) cvsAmount
@@ -60,7 +79,15 @@ from cvs_goods where store_id = #{storeId}
                  left join mt_order mo on mo.id = mog.order_id
                  left join mt_goods mg on mog.goods_id = mg.id
                  left join cvs_goods cg on mg.cvs_good_id = cg.id
-        where mo.store_id = #{storeId}
+          <where>
+              mo.store_id = #{record.storeId}
+              <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                  and date_format(mog.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+              </if>
+              <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                  and date_format(mog.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+              </if>
+          </where>
         group by cg.id
         ORDER BY cvgNumber desc
         limit 1
@@ -71,7 +98,15 @@ from cvs_goods where store_id = #{storeId}
         from mt_order_goods mog
                  left join mt_order mo on mo.id = mog.order_id
                  left join mt_goods mg on mog.goods_id = mg.id
-        where mo.store_id = #{storeId}
+        <where>
+            mo.store_id = #{record.storeId}
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(mog.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(mog.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
         group by mg.id
         ORDER BY goodsNumber desc
         limit 1
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
index 8dc2c012f..a0bf22057 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
@@ -115,10 +115,10 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
                 record.setStoreName(mtStore.getName());
             }
             // 商品信息
-            OrderGoodsVO orderGoodsVO = orderGoodsMapper.selectInfoByStoreId1(record);
-            OrderGoodsVO orderGoodsVO1 = orderGoodsMapper.selectInfoByStoreId2(record);
-            OrderGoodsVO orderGoodsVO2 = orderGoodsMapper.selectInfoByStoreIdType(record);// 热销品类信息
-            OrderGoodsVO orderGoodsVO3 = orderGoodsMapper.selectInfoByStoreIdGoods(record);// 热销商品信息
+            OrderGoodsVO orderGoodsVO = orderGoodsMapper.selectInfoByStoreId1(record,order);
+            OrderGoodsVO orderGoodsVO1 = orderGoodsMapper.selectInfoByStoreId2(record,order);
+            OrderGoodsVO orderGoodsVO2 = orderGoodsMapper.selectInfoByStoreIdType(record,order);// 热销品类信息
+            OrderGoodsVO orderGoodsVO3 = orderGoodsMapper.selectInfoByStoreIdGoods(record,order);// 热销商品信息
 
             if (ObjectUtil.isNotEmpty(orderGoodsVO)) {
                 record.setCvsNum(orderGoodsVO.getCvsNum());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index de452049e..fb3924d33 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -497,6 +497,14 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 
         Map<String, Object> orders = new HashMap<>();
 
+        // 当订单中包含商品时，若使用支付方式储值卡、囤油卡、车队卡时，提示：该订单含有商品,无法使用储值卡/囤油卡/车队卡支付；
+        if (!goodsOrder.equals("[]")) {
+            if((payType.equals("card_value") || payType.equals("fule_card") || payType.equals("car_card_value"))){
+                orders.put("error", "该订单含有商品,无法使用储值卡/囤油卡/车队卡支付");
+                return orders;
+            }
+        }
+
         String transactionType = null;
         if (oilAmount > 0 && goodsAmount > 0) {
             transactionType = "5";