chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
墨大叔 2024-07-22 17:33:01 +08:00
parent c778ca5abc
commit 843314c5d3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -244,16 +244,16 @@ public class TransactionBillServiceImpl implements TransactionBillService {
BigDecimal arrivalAmount = order.getMoney();// 订单商户到账金额
// 月费商户才出账
// if (UserServiceType.MONTH.getType().equals(mch.getServiceType())) {
// int count = receiveBillService.genBillByMonth(mch, YearMonth.now());
// ServiceUtil.assertion(count == 0, "商户出账失败，请刷新后重试");
// }
// // 其他一律为收取服务费
// else {
if (UserServiceType.MONTH.getType().equals(mch.getServiceType())) {
int count = receiveBillService.genBillByMonth(mch, YearMonth.now());
ServiceUtil.assertion(count == 0, "商户出账失败，请刷新后重试");
}
// 其他一律为收取服务费
else {
BigDecimal serviceRate = this.getServiceRate(order.getDeviceId(), order.getChannelId());
serviceCharge = serviceRate.multiply(order.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); // 服务费
arrivalAmount = order.getMoney().subtract(serviceCharge); // 商户最终到账的金额 = 交易金额 - 服务费
// }
}
order.setArrivalAmount(arrivalAmount);
order.setServiceCharge(serviceCharge);
}