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 - 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 and o.sn = #{sn} AND date_format(f.create_time,'%y%m%d') >= 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" and o.sn = #{sn} and o.area_id = #{areaId} - AND date_format(o.create_time,'%y%m%d') >= date_format(#{startDateStr},'%y%m%d') + AND date_format(ref.create_time,'%y%m%d') >= date_format(#{startDateStr},'%y%m%d') - AND date_format(o.create_time,'%y%m%d') <= date_format(#{endDateStr},'%y%m%d') + AND date_format(ref.create_time,'%y%m%d') <= date_format(#{endDateStr},'%y%m%d') AND ref.type = 1 AND ref.refund_result = 'SUCCESS'