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-07-26 11:53:59 +08:00
parent 46dac8bc57
commit 43676f28d7
8 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java
View File

@ -223,4 +223,7 @@ public class EtOperatingArea extends BaseEntityPlus implements Serializable
/** 图片路径*/
private String guideMap;
/** 导览开关*/
private String guideSwitch;
}

3
electripper-system/src/main/java/com/ruoyi/system/domain/vo/ReconciliationVo.java
View File

@ -25,6 +25,9 @@ public class ReconciliationVo {
//总手续费
private BigDecimal totalServiceFee;
//总平台服务费额
private BigDecimal totalPlatformServiceFee;
//总收入
private BigDecimal totalIncome;

4
electripper-system/src/main/java/com/ruoyi/system/mapper/EtCapitalFlowMapper.java
View File

@ -71,7 +71,7 @@ public interface EtCapitalFlowMapper
*/
BigDecimal getWithdrawnFee(@Param("areaId") Long areaId, @Param("status") String status);
BigDecimal getHandlingFee(@Param("timeStart") String timeStart, @Param("timeEnd") String timeEnd, @Param("areaId") Long areaId);
BigDecimal getHandlingFee(@Param("timeStart") String timeStart, @Param("timeEnd") String timeEnd, @Param("sn") String sn, @Param("areaId") Long areaId);
BigDecimal getServiceFee(@Param("timeStart") String timeStart, @Param("timeEnd") String timeEnd, @Param("areaId") Long areaId);
BigDecimal getServiceFee(@Param("timeStart") String timeStart, @Param("timeEnd") String timeEnd, @Param("sn") String sn, @Param("areaId") Long areaId);
}

8
electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java
View File

@ -274,10 +274,10 @@ public interface EtOrderMapper
*/
BigDecimal getPartnerFee(@Param("startDateStr") String startDateStr , @Param("endDateStr") String endDateStr, @Param("areaId") Long areaId);
/**
* 平台服务费
*/
BigDecimal getPlatformServiceFee(@Param("startDateStr") String startDateStr , @Param("endDateStr") String endDateStr, @Param("areaId") Long areaId);
// /**
// * 平台服务费
// */
// BigDecimal getPlatformServiceFee(@Param("startDateStr") String startDateStr , @Param("endDateStr") String endDateStr, @Param("areaId") Long areaId);
Integer getAppCount();

31
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -818,11 +818,11 @@ public class EtOrderServiceImpl implements IEtOrderService
indexAdminVo.setReturnOrderCount(etOrderMapper.getAuditOrderNum(null,null,null));//还车待审核订单
indexAdminVo.setReturnOrderDeductFee(etOrderMapper.getReturnOrderDeductFee(null,null,null));// 待审核还车押金扣款
indexAdminVo.setTodayHandlingFee(etCapitalFlowMapper.getHandlingFee(startDateStr, endDateStr, null));// 今日支付手续费
indexAdminVo.setTotalHandlingFee(etCapitalFlowMapper.getHandlingFee(null, null, null));// 总手续费
indexAdminVo.setTodayHandlingFee(etCapitalFlowMapper.getHandlingFee(startDateStr, endDateStr, null,null));// 今日支付手续费
indexAdminVo.setTotalHandlingFee(etCapitalFlowMapper.getHandlingFee(null, null, null,null));// 总手续费
indexAdminVo.setTodayServiceFee(etCapitalFlowMapper.getServiceFee(startDateStr, endDateStr, null));//今日服务费
indexAdminVo.setTotalServiceFee(etCapitalFlowMapper.getServiceFee(null, null, null));// 总服务费
indexAdminVo.setTodayServiceFee(etCapitalFlowMapper.getServiceFee(startDateStr, endDateStr, null,null));//今日服务费
indexAdminVo.setTotalServiceFee(etCapitalFlowMapper.getServiceFee(null, null, null,null));// 总服务费
return indexAdminVo;
}
@ -1320,32 +1320,31 @@ public class EtOrderServiceImpl implements IEtOrderService
SysDept deptObjByAreaId = wxPayService.getDeptObjByAreaId(areaId);
reconciliation.setDeptName(deptObjByAreaId.getDeptName());
reconciliation.setDay(formattedDate);
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
String handlingCharge = sysDept.getHandlingCharge();
BigDecimal payFee = defaultIfNull(etOrderMapper.getPayFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//新增
BigDecimal refundFee = defaultIfNull(etOrderMapper.getRefundFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//退款
BigDecimal divide = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 4, RoundingMode.HALF_UP);
BigDecimal serviceFee = payFee.multiply(divide).setScale(2, RoundingMode.HALF_UP);//手续费
BigDecimal incomeFee = defaultIfNull(payFee.subtract(serviceFee).subtract(refundFee), BigDecimal.ZERO);//营收
BigDecimal serviceFee = etCapitalFlowMapper.getHandlingFee(startDateStr, endDateStr, null, areaId);//手续费,扣除掉退款部分的
BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(startDateStr, endDateStr, null,areaId);//平台服务费 ,扣除掉退款部分的
BigDecimal incomeFee = defaultIfNull(payFee.subtract(serviceFee).subtract(refundFee).subtract(platformServiceFee), BigDecimal.ZERO);//营收 = 新增 - 手续费 - 退款 - 平台服务费
reconciliation.setPayFee(payFee);
reconciliation.setRefundFee(refundFee);
reconciliation.setIncome(incomeFee);
reconciliation.setServiceFee(serviceFee);
reconciliation.setPartnerFee(etOrderMapper.getPartnerFee(startDateStr, endDateStr, areaId));
reconciliation.setPlatformServiceFee(etOrderMapper.getPlatformServiceFee(startDateStr, endDateStr, areaId));
reconciliation.setPlatformServiceFee(platformServiceFee);
ridingFee.append("营收："+incomeFee +"元").append(System.lineSeparator());
ridingFee.append("新增："+payFee +"元").append(System.lineSeparator());
ridingFee.append("退款："+refundFee +"元").append(System.lineSeparator());
ridingFee.append("手续费："+serviceFee +"元").append(System.lineSeparator());
ridingFee.append("平台服务费："+platformServiceFee +"元").append(System.lineSeparator());
reconciliation.setRidingFee(ridingFee.toString());
dispatchFee.append("营收："+incomeFee +"元").append(System.lineSeparator());
dispatchFee.append("新增："+payFee +"元").append(System.lineSeparator());
dispatchFee.append("退款："+refundFee +"元").append(System.lineSeparator());
dispatchFee.append("手续费："+serviceFee +"元").append(System.lineSeparator());
dispatchFee.append("平台服务费："+platformServiceFee +"元").append(System.lineSeparator());
reconciliation.setDispatchFee(dispatchFee.toString());
return reconciliation;
@ -1358,12 +1357,11 @@ public class EtOrderServiceImpl implements IEtOrderService
reconciliation.setPayFee(payFee);
BigDecimal refundFee = etOrderMapper.getRefundFee(timeStart, timeEnd, sn, null);
reconciliation.setRefundFee(refundFee);
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
String handlingCharge = sysDept.getHandlingCharge();
BigDecimal divide = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 4, RoundingMode.HALF_UP);
BigDecimal serviceFee = payFee.multiply(divide).setScale(2, RoundingMode.HALF_UP);//手续费
reconciliation.setIncome(payFee.subtract(refundFee).subtract(serviceFee));
BigDecimal serviceFee = etCapitalFlowMapper.getHandlingFee(timeStart, timeEnd, sn, areaId);//手续费
BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(timeStart, timeEnd, sn, areaId);//平台服务费
reconciliation.setIncome(payFee.subtract(refundFee).subtract(serviceFee).subtract(platformServiceFee));
reconciliation.setServiceFee(serviceFee);
reconciliation.setPlatformServiceFee(platformServiceFee);
return reconciliation;
}
@ -1377,6 +1375,7 @@ public class EtOrderServiceImpl implements IEtOrderService
reconciliationVo.setTotalRefundFee(calculateTotalField(reconciliations, ReconciliationVo.Reconciliation::getRefundFee));
reconciliationVo.setTotalServiceFee(calculateTotalField(reconciliations, ReconciliationVo.Reconciliation::getServiceFee));
reconciliationVo.setTotalIncome(calculateTotalField(reconciliations, ReconciliationVo.Reconciliation::getIncome));
reconciliationVo.setTotalPlatformServiceFee(calculateTotalField(reconciliations, ReconciliationVo.Reconciliation::getPlatformServiceFee));
}
private BigDecimal calculateTotalField(List<ReconciliationVo.Reconciliation> reconciliations, java.util.function.Function<ReconciliationVo.Reconciliation, BigDecimal> getter) {

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

@ -104,25 +104,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getHandlingFee" resultType="java.math.BigDecimal">
select COALESCE(SUM(handling_charge), 0) from et_capital_flow f where area_id != 14
select
COALESCE(SUM(CASE WHEN f.type = '1' THEN handling_charge ELSE 0 END), 0) -
COALESCE(SUM(CASE WHEN f.type = '2' THEN 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.area_id != 14 and 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(create_time,'%y%m%d') &gt;= date_format(#{timeStart},'%y%m%d')
AND date_format(f.create_time,'%y%m%d') &gt;= date_format(#{timeStart},'%y%m%d')
</if>
<if test="timeEnd != null and timeEnd != ''">
AND date_format(create_time,'%y%m%d') &lt;= date_format(#{timeEnd},'%y%m%d')
AND date_format(f.create_time,'%y%m%d') &lt;= date_format(#{timeEnd},'%y%m%d')
</if>
<if test="areaId != null and areaId != ''"> and area_id = #{areaId}</if>
<if test="areaId != null and areaId != ''"> and f.area_id = #{areaId}</if>
</select>
<select id="getServiceFee" resultType="java.math.BigDecimal">
select COALESCE(SUM(platform_service_fee), 0) from et_capital_flow f where area_id != 14
select
COALESCE(SUM(CASE WHEN f.type = '1' THEN platform_service_fee ELSE 0 END), 0) -
COALESCE(SUM(CASE WHEN f.type = '2' THEN 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
<if test="sn != null and sn != ''"> and o.sn = #{sn}</if>
<if test="timeStart != null and timeStart != ''">
AND date_format(create_time,'%y%m%d') &gt;= date_format(#{timeStart},'%y%m%d')
AND date_format(f.create_time,'%y%m%d') &gt;= date_format(#{timeStart},'%y%m%d')
</if>
<if test="timeEnd != null and timeEnd != ''">
AND date_format(create_time,'%y%m%d') &lt;= date_format(#{timeEnd},'%y%m%d')
AND date_format(f.create_time,'%y%m%d') &lt;= date_format(#{timeEnd},'%y%m%d')
</if>
<if test="areaId != null and areaId != ''"> and area_id = #{areaId}</if>
<if test="areaId != null and areaId != ''"> and f.area_id = #{areaId}</if>
</select>

8
electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml
View File

@ -52,6 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="customService" column="custom_service" />
<result property="isDepositDeduction" column="is_deposit_deduction" />
<result property="returnVerify" column="return_verify" />
<result property="upperRight" column="upper_right" />
<result property="lowerLeft" column="lower_left" />
<result property="guideMap" column="guide_map" />
<result property="guideSwitch" column="guide_switch" />
</resultMap>
<sql id="selectEtOperatingAreaVo">
@ -62,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
no_riding_outage, authentication, msg_switch, undercharge, error, cast(agreement as char) as agreement, deposit,
outage, appointment_service_fee, dispatch_fee, vehicle_management_fee, timeout_minutes,
auto_replacement_order, area_time_start, area_time_end, area_out_return, parking_return, service_name1, service_name2,
service_name3, service_phone1, service_phone2, service_phone3, custom_service, is_deposit_deduction, return_verify from et_operating_area
service_name3, service_phone1, service_phone2, service_phone3, custom_service, is_deposit_deduction, return_verify, upper_right, lower_left, guide_map,guide_switch from et_operating_area
</sql>
<select id="selectEtOperatingAreaList" parameterType="EtOperatingArea" resultMap="EtOperatingAreaResult">
@ -73,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.no_riding_outage, a.authentication, a.msg_switch, a.undercharge, a.error, a.agreement, a.deposit,
a.outage, a.appointment_service_fee, a.dispatch_fee, a.vehicle_management_fee, a.timeout_minutes,
a.auto_replacement_order, a.area_time_start, a.area_time_end, a.area_out_return, a.parking_return,
a.service_name1, a.service_name2, a.service_name3, a.service_phone1, a.service_phone2, a.service_phone3, a.custom_service, a.is_deposit_deduction,a.return_verify from et_operating_area a
a.service_name1, a.service_name2, a.service_name3, a.service_phone1, a.service_phone2, a.service_phone3, a.custom_service, a.is_deposit_deduction,a.return_verify, a.upper_right, a.lower_left, a.guide_map,guide_switch from et_operating_area a
left join et_area_dept ad on ad.area_id = a.area_id
left join sys_dept d on d.dept_id = ad.dept_id
where 1 = 1

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

@ -519,7 +519,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<!--todo 待修改-->
<select id="getRefundFee" resultType="java.math.BigDecimal">
select COALESCE(SUM(amount), 0) from et_refund ref
left join et_order o on o.order_no = ref.order_no