qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.运营数据统计扣除退款手续费

Browse Source
This commit is contained in:
邱贞招 2024-09-21 16:23:57 +08:00
parent 81e48c1df4
commit 596359030c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
View File

@ -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')

4
electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
View File

@ -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>