diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 3a889dba1..dc8a25c9f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -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(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 2230ff608..4886cdd3e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -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)) {