From 4ff0a37e7ac7c24dffb044684f125c05f018436a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 30 十月 2024 13:25:14 +0800
Subject: [PATCH] 1.财务报表-销售额（原订单）调整

---
 src/main/resources/mapper/wallet/WalletBillRecordMapper.xml |   48 ++++++++++++++----------------------------------
 1 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index 676d23e..ea5b876 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -38,9 +38,8 @@
 
     </select>
     <select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
-        select t.* ,s.name supplierName from t_wallet_bill_record t
+        select t.* ,s.name supplierName ,w.approve_time as approveTime  from t_wallet_bill_record t
         left join t_supplier_info s on t.supplier_id = s.id
-        left join t_order o on t.order_id = o.id
         left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id
         where t.deleted= 0
         <if test="dto.supplierName != null and dto.supplierName != ''">
@@ -50,39 +49,29 @@
             and t.supplier_id = #{dto.supplierId}
         </if>
         <if test="dto.type != null and dto.type != ''">
-            and t.type = #{type}
+            and t.type = #{dto.type}
         </if>
         <if test="dto.orderNo != null and dto.orderNo != ''">
-            and o.order_no = like concat('%', #{orderNo}, '%')
+            and t.order_no  like concat('%', #{dto.orderNo}, '%')
         </if>
         <if test="dto.createStartDate!=null ">
-            <![CDATA[
-               AND w.create_time &gt;= #{dto.createStartDate}
-            ]]>
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
         </if>
         <if test="dto.endEndDate!=null ">
-            <![CDATA[
-               AND w.create_time &lt;= #{dto.endEndDate}
-            ]]>
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
         </if>
         <if test="dto.approveStartDate!=null ">
-            <![CDATA[
-               AND w.approve_time &gt;= #{dto.approveStartDate}
-            ]]>
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &gt;= #{dto.approveStartDate}
         </if>
         <if test="dto.approveEndDate!=null ">
-            <![CDATA[
-               AND w.approve_time &lt;= #{dto.approveStartDate}
-            ]]>
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &lt;= #{dto.approveEndDate}
         </if>
-
         order by t.create_time
     </select>
 
     <select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
-        select t.* ,s.name supplierName from t_wallet_bill_record t
+        select t.* , s.name supplierName, w.approve_time as approveTime from t_wallet_bill_record t
         left join t_supplier_info s on t.supplier_id = s.id
-        left join t_order o on t.order_id = o.id
         left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id
         where t.deleted= 0
         <if test="dto.supplierName != null and dto.supplierName != ''">
@@ -92,32 +81,23 @@
             and t.supplier_id = #{dto.supplierId}
         </if>
         <if test="dto.type != null and dto.type != ''">
-            and t.type = #{type}
+            and t.type = #{dto.type}
         </if>
         <if test="dto.orderNo != null and dto.orderNo != ''">
-            and o.order_no = like concat('%', #{orderNo}, '%')
+            and t.order_no  like concat('%', #{dto.orderNo}, '%')
         </if>
         <if test="dto.createStartDate!=null ">
-            <![CDATA[
-               AND w.create_time &gt;= #{dto.createStartDate}
-            ]]>
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
         </if>
         <if test="dto.endEndDate!=null ">
-            <![CDATA[
-               AND w.create_time &lt;= #{dto.endEndDate}
-            ]]>
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
         </if>
         <if test="dto.approveStartDate!=null ">
-            <![CDATA[
-               AND w.approve_time &gt;= #{dto.approveStartDate}
-            ]]>
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &gt;= #{dto.approveStartDate}
         </if>
         <if test="dto.approveEndDate!=null ">
-            <![CDATA[
-               AND w.approve_time &lt;= #{dto.approveStartDate}
-            ]]>
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &lt;= #{dto.approveEndDate}
         </if>
-
         order by t.create_time
     </select>
 </mapper>

--
Gitblit v1.9.3