autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 19:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
YAS\29473
2025-12-15 15:50:48 +08:00
parent c1b620ff46 c031dd9429
commit 0e620019db
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -1100,6 +1100,11 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
.build();
memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO);
// 判断消费金额，如果消费金额小于 1 元，则将保险费也进行退回
if (orderBasicInfo.getOrderAmount().compareTo(BigDecimal.ONE) < 0) {
orderBasicInfoService.refundInsurance(orderBasicInfo);
}
// 更新order_pay_record, 解冻部分
// List<Map<String, Object>> list = calculateUnfreezeAmount(orderAmount, payRecordList);
// for (Map<String, Object> map : list) {
@@ -1146,6 +1151,12 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
applyRefundDTO.setWechatAppId(wechatAppId);
}
this.refundOrderWithAdapay(applyRefundDTO);
// 判断消费金额，如果消费金额小于 1 元，则将保险费也进行退回
if (orderBasicInfo.getOrderAmount().compareTo(BigDecimal.ONE) < 0) {
orderBasicInfoService.refundInsurance(orderBasicInfo);
}
}
/**