From 596359030cadf88b8530c3372d2ed0aa8a1ccb3c Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Sat, 21 Sep 2024 16:23:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=89=A3=E9=99=A4=E9=80=80=E6=AC=BE=E6=89=8B=E7=BB=AD?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/EtCapitalFlowMapper.xml | 13 +++++++++----
 .../main/resources/mapper/system/EtOrderMapper.xml  |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
index b634bdb..0b54bfe 100644
--- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
@@ -116,10 +116,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getHandlingFee" resultType="java.math.BigDecimal">
         select
-            COALESCE(SUM(CASE WHEN f.type = '1' THEN f.handling_charge ELSE 0 END), 0) AS net_fee
+            COALESCE(SUM(CASE
+            WHEN f.type = '1' AND f.bus_type = '1' THEN f.handling_charge  -- 收入手续费
+            WHEN f.type = '2' AND f.bus_type = '4' THEN -f.handling_charge -- 退款手续费 (负数)
+            ELSE 0
+            END), 0) AS net_fee
         from et_capital_flow f
         LEFT JOIN et_order o on o.order_no = f.order_no
-        where f.bus_type != '5' and f.bus_type != '6' and f.type = 1
+        where f.bus_type != '5' and f.bus_type != '6'
         <if test="sn != null  and sn != ''"> and o.sn = #{sn}</if>
         <if test="timeStart != null  and timeStart != ''">
             AND date_format(f.create_time,'%y%m%d') &gt;= date_format(#{timeStart},'%y%m%d')
@@ -132,10 +136,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getServiceFee" resultType="java.math.BigDecimal">
         select
-            COALESCE(SUM(f.platform_service_fee), 0) AS net_fee
+            COALESCE(SUM(CASE WHEN f.type = 1 THEN f.platform_service_fee ELSE 0 END), 0)
+            - COALESCE(SUM(CASE WHEN f.type = 2 THEN f.platform_service_fee ELSE 0 END), 0) AS net_fee
         from et_capital_flow f
         LEFT JOIN et_order o on o.order_no = f.order_no
-        where f.area_id != 14 and f.type = 1
+        where f.area_id != 14
         <if test="sn != null  and sn != ''"> and o.sn = #{sn}</if>
         <if test="timeStart != null  and timeStart != ''">
             AND date_format(f.create_time,'%y%m%d') &gt;= date_format(#{timeStart},'%y%m%d')
diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
index 2975181..9aaa984 100644
--- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
@@ -698,10 +698,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sn != null  and sn != ''"> and o.sn = #{sn}</if>
             <if test="areaId != null"> and o.area_id = #{areaId}</if>
             <if test="startDateStr != null  and startDateStr != ''">
-                AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{startDateStr},'%y%m%d')
+                AND date_format(ref.create_time,'%y%m%d') &gt;= date_format(#{startDateStr},'%y%m%d')
             </if>
             <if test="endDateStr != null  and endDateStr != ''">
-                AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{endDateStr},'%y%m%d')
+                AND date_format(ref.create_time,'%y%m%d') &lt;= date_format(#{endDateStr},'%y%m%d')
             </if>
             AND ref.type = 1 AND ref.refund_result = 'SUCCESS'
         </where>