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-09-11 14:05:01 +08:00
parent 65754161b6
commit 93181b4f21
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/pay/syb/util/SybUtil.java
View File

@ -222,7 +222,7 @@ public class SybUtil {
Map reqMap = request.getParameterMap();
for(Object key:reqMap.keySet()){
String value = ((String[])reqMap.get(key))[0];
System.out.println(key+";"+value);
// System.out.println(key+";"+value);
map.put(key.toString(),value);
}
return map;

5
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/enums/PayBillStatus.java
View File

@ -33,4 +33,9 @@ public enum PayBillStatus {
public static List<String> getCanCancelList() {
return asList(WAIT_PAY, PAYING);
}
// 已经支付过的状态
public static List<String> payedList() {
return asList(PAY_SUCCESS, REFUNDING, REFUNDED);
}
}

6
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/impl/PayBillServiceImpl.java
View File

@ -257,8 +257,12 @@ public class PayBillServiceImpl implements PayBillService
}
private void handleSuccess(PayBillVO payBill, LocalDateTime payTime) {
log.info("获取支付订单:{}", payBill);
ServiceUtil.assertion(payBill == null, "支付订单不存在");
log.info("获取支付订单:{}", payBill.getPayNo());
// 若已经支付成功，则跳过
if (PayBillStatus.payedList().contains(payBill.getStatus())) {
return;
}
ServiceUtil.assertion(!PayBillStatus.PAYING.getStatus().equals(payBill.getStatus()), "该支付订单不是正在支付的支付订单");
transactionTemplate.execute(status -> {

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

@ -1440,7 +1440,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
// 按比例计算退款金额
BigDecimal refundAmount = dto.getRefundAmount();
BigDecimal refundRate = refundAmount.divide(bill.getMoney(), 2, RoundingMode.HALF_UP); // 退款金额比例
BigDecimal refundServiceAmount = bill.getServiceCharge().multiply(refundRate); // 退款的手续费
BigDecimal refundServiceAmount = bill.getServiceCharge().multiply(refundRate).setScale(2, RoundingMode.HALF_UP); // 退款的手续费
BigDecimal refundMchAmount = refundAmount.subtract(refundServiceAmount); // 退款的商户余额
userService.subtractBalance(bill.getMchId(), refundMchAmount, dto.getRefundReason(), RecordBalanceBstType.RECHARGE, bill.getBillId());