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

修复bug

Browse Source
This commit is contained in:
邱贞招 2024-11-25 08:32:38 +08:00
parent e405734501
commit b013683cd5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
View File

@ -663,7 +663,8 @@ public class CallbackServiceImpl implements CallbackService {
* 资金流水记录 * 资金流水记录
* */ * */
@Override @Override
public EtCapitalFlow capitalFlowRecords(EtOrder order,String type,String busType,String ownerType,SysUser user,String payType,BigDecimal totalPartnerDividend,BigDecimal refundPercentage) { public EtCapitalFlow capitalFlowRecords(EtOrder order,String type,String busType,String ownerType,SysUser user,String payType,
BigDecimal totalPartnerDividend,BigDecimal refundPercentage) {
EtCapitalFlow capitalFlow = new EtCapitalFlow(); EtCapitalFlow capitalFlow = new EtCapitalFlow();
if(ownerType.equals(ServiceConstants.OWNER_TYPE_OPERATOR)){//运营商 if(ownerType.equals(ServiceConstants.OWNER_TYPE_OPERATOR)){//运营商
SysDept sysDept = wxPayService.getDeptObjByAreaId(order.getAreaId()); SysDept sysDept = wxPayService.getDeptObjByAreaId(order.getAreaId());
@ -828,6 +829,7 @@ public class CallbackServiceImpl implements CallbackService {
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setUserType("03"); sysUser.setUserType("03");
sysUser.setAreaId(order.getAreaId()); sysUser.setAreaId(order.getAreaId());
sysUser.setStatus("0");
List<SysUser> sysUsers = userMapper.selectUserList(sysUser); List<SysUser> sysUsers = userMapper.selectUserList(sysUser);
// 计算总的分成比例，过滤掉合作时间过期的用户 // 计算总的分成比例，过滤掉合作时间过期的用户
double totalDividendProportion = sysUsers.stream() double totalDividendProportion = sysUsers.stream()

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

@ -639,6 +639,7 @@ public class EtOrderServiceImpl implements IEtOrderService
afterDeductionFee = BigDecimal.ZERO; afterDeductionFee = BigDecimal.ZERO;
mark = "押金抵扣成功，骑行费【"+ridingFee+"】大于押金【"+deposit+"】"; mark = "押金抵扣成功，骑行费【"+ridingFee+"】大于押金【"+deposit+"】";
order1.setPayFee(deposit);//实际支付金额等于押金 order1.setPayFee(deposit);//实际支付金额等于押金
order.setPayFee(deposit);//实际支付金额等于押金
}else{ }else{
// 押金大于订单金额 扣除后 // 押金大于订单金额 扣除后
afterDeductionFee = deposit.subtract(ridingFee); afterDeductionFee = deposit.subtract(ridingFee);

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

@ -455,7 +455,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getTotalIncome" resultType="java.lang.String"> <select id="getTotalIncome" resultType="java.lang.String">
select COALESCE(SUM(total_fee), 0) from et_order where status = 4 and type = 1 select COALESCE(SUM(pay_fee), 0) from et_order where status = 4 and type = 1
<if test="timeStart != null and timeStart != ''"> <if test="timeStart != null and timeStart != ''">
AND DATE(create_time) &gt;= #{timeStart} AND DATE(create_time) &gt;= #{timeStart}
</if> </if>
@ -466,7 +466,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getTotalUnpaid" resultType="java.lang.String" parameterType="String"> <select id="getTotalUnpaid" resultType="java.lang.String" parameterType="String">
select COALESCE(SUM(total_fee), 0) from et_order where status = 3 and type = 1 and paid = 0 select COALESCE(SUM(pay_fee), 0) from et_order where status = 3 and type = 1 and paid = 0
<if test="timeStart != null and timeStart != ''"> <if test="timeStart != null and timeStart != ''">
AND DATE(create_time) &gt;= #{timeStart} AND DATE(create_time) &gt;= #{timeStart}
</if> </if>
@ -477,7 +477,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getTotalPaid" resultType="java.lang.String"> <select id="getTotalPaid" resultType="java.lang.String">
select COALESCE(SUM(total_fee), 0) from et_order where status = 4 and type = 1 and paid = 1 select COALESCE(SUM(pay_fee), 0) from et_order where status = 4 and type = 1 and paid = 1
<if test="timeStart != null and timeStart != ''"> <if test="timeStart != null and timeStart != ''">
and DATE(pay_time) &gt;= #{timeStart} and DATE(pay_time) &gt;= #{timeStart}
</if> </if>