|
|
@@ -290,9 +290,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
}
|
|
|
}
|
|
|
agencyExtractFee.setSumpremium(bigDecimal);
|
|
|
- BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
|
|
|
- .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
|
|
|
- agencyExtractFee.setExtractFee(multiply);
|
|
|
+ if (!bigDecimal.equals(new BigDecimal("0.00"))) {
|
|
|
+
|
|
|
+ BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
|
|
|
+ .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
|
|
|
+ agencyExtractFee.setExtractFee(multiply);
|
|
|
+ }else {
|
|
|
+ agencyExtractFee.setExtractFee(new BigDecimal("0.00"));
|
|
|
+ }
|
|
|
// 填充 已提现抽成费用和可提现抽成费用
|
|
|
List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
|
|
|
.eq(SysAgencyFeeApproval::getUserId, sysPartner.getUserId())
|
|
|
@@ -302,15 +307,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
historyFee = historyFee.add(sysAgencyFeeApproval.getHistoryFee());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (!bigDecimal.equals(new BigDecimal("0.00"))) {
|
|
|
+ BigDecimal extractFee = agencyExtractFee.getExtractFee();
|
|
|
+ if (!extractFee.equals(new BigDecimal("0.00"))) {
|
|
|
//已提现
|
|
|
agencyExtractFee.setHistoryFee(historyFee);
|
|
|
//可提现 = 总抽成-已提现
|
|
|
- agencyExtractFee.setCashFee(multiply.subtract(historyFee));
|
|
|
+ agencyExtractFee.setCashFee(extractFee.subtract(historyFee));
|
|
|
} else {
|
|
|
agencyExtractFee.setHistoryFee(new BigDecimal("0.00"));
|
|
|
- agencyExtractFee.setCashFee(multiply.subtract(new BigDecimal("0.00")));
|
|
|
+ agencyExtractFee.setCashFee(extractFee.subtract(new BigDecimal("0.00")));
|
|
|
}
|
|
|
|
|
|
}else {
|
