From 5f34ef702020f5f934ab98ea282960d486e0719a Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Thu, 14 Nov 2024 10:07:11 +0800
Subject: [PATCH] 11.14

---
 .../mapper/xml/CardCouponUserMapper.xml          |  1 +
 .../order/mapper/xml/CashierOrderMapper.xml      | 11 +++++++++--
 .../business/order/mapper/xml/OilOrderMapper.xml |  3 ++-
 .../views/cashier/NewComponents/writeList.vue    |  4 +++-
 .../views/cashier/orderComponents/order_Oil.vue  | 16 +++++++++++++---
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml
index 3ef351cf5..be67a536e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml
@@ -123,6 +123,7 @@
                 <![CDATA[  and ccu.update_time <= concat(#{obj.end},' 23:59:59') ]]>
             </if>
         </where>
+        order by ccu.update_time desc
     </select>
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
index fbabd04b6..b64f4f7d5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
@@ -97,20 +97,27 @@
         count(CASE WHEN goods_order_amount > 0 THEN 1 ELSE null END) AS s9 -- 商品订单数量
         from cashier_order
         <where>
+            status = 'paid'
             <if test="order.staffId != null and order.staffId != ''">
                 and staff_id = #{order.staffId}
             </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
             <if test="order.orderNo != null and order.orderNo != ''">
                 and order_no like concat('%', #{order.orderNo}, '%')
             </if>
+            <if test="order.payUser != null and order.payUser != ''">
+                and pay_user like concat('%', #{order.payUser}, '%')
+            </if>
             <if test="order.terminal != null and order.terminal != ''">
                 and terminal like concat('%', #{order.terminal}, '%')
             </if>
             <if test="order.params.beginTime != null and order.params.beginTime != ''">
-                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                and date_format(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(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
             </if>
 
         </where>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index f854a1822..5d51a92a9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -548,7 +548,8 @@
         sum( CASE WHEN pay_type = 'card_value' THEN  pay_amount  END ) AS cardValue
         from oil_order
         <where>
-            store_id = #{order.storeId}
+            order_status = 'paid'
+            and store_id = #{order.storeId}
             <if test="order.userId != null and order.userId != ''">
                 and user_id = #{order.userId}
             </if>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
index 2e1c7bd32..a6541ddac 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
@@ -103,7 +103,7 @@
   </div>
 </template>
 <script>
-
+import { parseTime } from '@/utils/fuint'
 import { selectVerifiedList } from "@/api/online";
 import { queryStaffs } from '@/api/cashier/staff'
 export default {
@@ -132,6 +132,8 @@ export default {
   },
   methods:{
     getList(){
+      this.queryParams.begin = parseTime(this.queryParams.begin)
+      this.queryParams.end = parseTime(this.queryParams.end)
       selectVerifiedList(this.queryParams).then(res => {
         this.list = res.data.records;
         this.total = res.data.total
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 2bf043d3b..590d64ccd 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -40,7 +40,7 @@
             >
               <el-option v-for="item in oilGunList"
                          :key="item.id"
-                         :label="item.gunName"
+                         :label="item.oilName"
                          :value="item.id">
                 <span style="float: left">{{ item.oilName }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
@@ -205,8 +205,18 @@
               <el-table-column prop="discountAmount" label="优惠金额（元）" align="center"></el-table-column>
 
               <el-table-column prop="payAmount" label="实付金额（元）" align="center"></el-table-column>
-              <el-table-column prop="balanceAmount" label="储值卡付款金额（元）" align="center" />
-                          <el-table-column prop="oilCardAmount" label="囤油卡付款金额（元）" align="center" />
+              <el-table-column prop="balanceAmount" label="储值卡付款金额（元）" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.payType=='card_value'">{{ scope.row.payAmount }}</span>
+                  <span v-else>0</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="oilCardAmount" label="囤油卡付款金额（元）" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.payType=='fule_card'">{{ scope.row.payAmount }}</span>
+                  <span v-else>0</span>
+                </template>
+              </el-table-column>
               <el-table-column prop="payUser" label="付款用户" align="center" ></el-table-column>
               <el-table-column prop="payType" label="支付方式" align="center">
                 <template slot-scope="scope">