From f93b1617d28c9d353fae628bfb86e0c15fa07579 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 11:59:21 +0800
Subject: [PATCH] 1.提现-增加明细记录 2.报表-财务报表-增加总销售扎数统计，将原销售扎数改成实际销售扎数

---
 src/main/resources/mapper/wallet/WalletBillRecordMapper.xml |   49 +++++++++++++++++--------------------------------
 1 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index 88825d4..d333725 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -13,6 +13,9 @@
         <result column="supplier_id" property="supplierId" />
         <result column="wallet_id" property="walletId" />
         <result column="type" property="type" />
+
+        <result column="withdraw_type" property="withdrawType" />
+
         <result column="type_detail" property="typeDetail" />
         <result column="transfer_id" property="transferId" />
         <result column="method" property="method" />
@@ -38,7 +41,7 @@
 
     </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_wallet_withdraw_record w on t.withdraw_record_id = w.id
         where t.deleted= 0
@@ -49,37 +52,28 @@
             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 torder_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_wallet_withdraw_record w on t.withdraw_record_id = w.id
         where t.deleted= 0
@@ -90,32 +84,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 t.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