From f85651f863363b7f494f421301de9d02e0ae79ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 11 十一月 2024 12:49:33 +0800
Subject: [PATCH] fix:调整花农结算报表订单状态；查询时间无效

---
 src/main/resources/mapper/report/OrderReportMapper.xml      |    4 ++--
 src/main/resources/mapper/wallet/WalletBillRecordMapper.xml |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 2f8f3fa..bc6b171 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -519,7 +519,7 @@
         sum(order_num)-sum(order_lack_num) as real_sale_num,
         sum(sales_fee_supplier) sales_fee_supplier,
         sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount,
-        case when  COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END)  = 0 Then '已完成' Else '进行中' end as settleStatus
+        case when  COUNT(CASE WHEN status_backend ='COMPLETED' THEN NULL ELSE 1 END)  = 0 Then '已完成' Else '进行中' end as settleStatus
         from(
         SELECT
         oi.id,vor.*,p.name as supplierName,o.status_backend
@@ -546,7 +546,7 @@
         sum(order_num)-sum(order_lack_num) as real_sale_num,
         sum(sales_fee_supplier) sales_fee_supplier,
         sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount,
-        case when  COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END)  = 0 Then '已完成' Else '进行中' end as settleStatus
+        case when  COUNT(CASE WHEN status_backend ='COMPLETED' THEN NULL ELSE 1 END)  = 0 Then '已完成' Else '进行中' end as settleStatus
         from(
         SELECT
         oi.id,vor.*,p.name as supplierName,o.status_backend
diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index 5397612..37f7e00 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -77,10 +77,10 @@
             and t.order_no  like concat('%', #{dto.orderNo}, '%')
         </if>
         <if test="dto.createStartDate!=null ">
-            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
+            AND DATE_FORMAT(t.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
         </if>
         <if test="dto.endEndDate!=null ">
-            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
+            AND DATE_FORMAT(t.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
         </if>
         <if test="dto.approveStartDate!=null ">
             AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &gt;= #{dto.approveStartDate}
@@ -110,10 +110,10 @@
             and t.order_no  like concat('%', #{dto.orderNo}, '%')
         </if>
         <if test="dto.createStartDate!=null ">
-            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
+            AND DATE_FORMAT(t.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
         </if>
         <if test="dto.endEndDate!=null ">
-            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
+            AND DATE_FORMAT(t.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
         </if>
         <if test="dto.approveStartDate!=null ">
             AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &gt;= #{dto.approveStartDate}

--
Gitblit v1.9.3