mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-07-07 15:38:10 +08:00
update 支付回调中判断订单是否购买保险,如果购买,将启动充电金额减去保险金额
This commit is contained in:
@@ -146,6 +146,9 @@ public class OrderService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private PersonalChargingRecordService personalChargingRecordService;
|
private PersonalChargingRecordService personalChargingRecordService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IOrderInsuranceInfoService orderInsuranceInfoService;
|
||||||
|
|
||||||
// 引入线程池
|
// 引入线程池
|
||||||
private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
|
private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
|
||||||
|
|
||||||
@@ -1205,10 +1208,17 @@ public class OrderService {
|
|||||||
}
|
}
|
||||||
}, executor);
|
}, executor);
|
||||||
|
|
||||||
|
BigDecimal chargeAmount = BigDecimal.ZERO;
|
||||||
|
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
|
||||||
|
BigDecimal insuranceAmount = orderBasicInfo.getInsuranceAmount();
|
||||||
|
if (insuranceAmount != null) {
|
||||||
|
// 如果用户支付了保险金额,则充电金额需将保险金额减去
|
||||||
|
chargeAmount = amount.divide(insuranceAmount).setScale(2, RoundingMode.HALF_UP);
|
||||||
|
}
|
||||||
// 支付订单成功
|
// 支付订单成功
|
||||||
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
|
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
|
||||||
.orderCode(orderCode)
|
.orderCode(orderCode)
|
||||||
.payAmount(amount)
|
.payAmount(chargeAmount)
|
||||||
// .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
|
// .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
|
||||||
.payMode(payModel)
|
.payMode(payModel)
|
||||||
.acquirer(AcquirerEnum.ADAPAY.getValue())
|
.acquirer(AcquirerEnum.ADAPAY.getValue())
|
||||||
|
|||||||
Reference in New Issue
Block a user