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

修复在线支付保险订单 payAmount 与 payRecordAmount 不一致

Browse Source 
在线支付回调(adapayCallback)中主动将 payAmount 减去了 insuranceAmount 再传给回调，
但 order_pay_record 记录的是完整支付金额，导致校验时 payAmount(扣减后) ≠ payRecordAmount(完整)。

修复：
1. OrderService.adapayCallback: callbackDTO 传完整 amount，同时带上 insuranceAmount
2. payOrderSuccessCallback: 下发桩的启动金额用 payAmount - insuranceAmount 计算，
   订单主表 payAmount 仍为完整支付金额，与 payRecordAmount 一致
This commit is contained in:
Guoqs
2026-07-25 16:47:35 +08:00
parent de73b82f65
commit f11b781c27
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -1299,19 +1299,13 @@ public class OrderService {
}
}, executor);
// 初始化充电金额
BigDecimal chargeAmount = amount;
// 支付订单成功
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
BigDecimal insuranceAmount = orderBasicInfo.getInsuranceAmount();
if (insuranceAmount.compareTo(BigDecimal.ZERO) > 0) {
// 如果用户支付了保险金额，则充电金额需将保险金额减去
chargeAmount = amount.subtract(insuranceAmount).setScale(2, RoundingMode.HALF_UP);
}
// 支付订单成功
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
.orderCode(orderCode)
.payAmount(chargeAmount) // amount
// .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
.payAmount(amount) // 完整支付金额（含保险），与 order_pay_record 汇总一致
.insuranceAmount(insuranceAmount) // 保险金额，回调中用于计算下发桩的充电金额
.payMode(payModel)
.acquirer(AcquirerEnum.ADAPAY.getValue())
.build();

8
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -5406,8 +5406,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return;
}
// 获取启动金额
BigDecimal chargeAmount = computeChargeAmount(orderInfo.getMerchantId(), orderInfo.getStationId(), orderInfo.getMemberId(), dto.getPayAmount());
// 获取启动金额：保险金额不计入下发桩的充电额度
BigDecimal payAmountForPile = dto.getPayAmount();
if (dto.getInsuranceAmount() != null && dto.getInsuranceAmount().compareTo(BigDecimal.ZERO) > 0) {
payAmountForPile = dto.getPayAmount().subtract(dto.getInsuranceAmount());
}
BigDecimal chargeAmount = computeChargeAmount(orderInfo.getMerchantId(), orderInfo.getStationId(), orderInfo.getMemberId(), payAmountForPile);
// 发送启动指令
if (StringUtils.equals(pileConnectorDetailVO.getChargePortType(), Constants.THREE)) {