From 9d8cf73f928b13690e61cc3d3c9a220d08ece027 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 19 Sep 2025 10:08:00 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E4=BF=9D=E9=99=A9=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/test/java/PaymentTestController.java | 6 +++--- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 8e163d7de..6a87a74ef 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -539,10 +539,10 @@ public class PaymentTestController { */ @Test public void createPaymentReverseRequestTest() { - String paymentId = "002212025091616304410813943148522684416"; - BigDecimal refundAmount = new BigDecimal("0.5"); + String paymentId = "002212025091909381410814926502197886976"; + BigDecimal refundAmount = new BigDecimal("0.02"); String memberId = "65622699"; - String orderCode = "C65858163754"; + String orderCode = "C63345490920"; // 延迟分账未确认调撤销调撤销接口退款 PaymentReverseOperation operation = new PaymentReverseOperation(); 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 b38905346..342ad067b 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 @@ -2063,6 +2063,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 订单信息 OrderBasicInfo orderBasicInfo = afterSettleOrderDTO.getOrderBasicInfo(); + // 保险金额(有默认值 0.00) + BigDecimal insuranceAmount = orderBasicInfo.getInsuranceAmount(); + // 订单是否需要分账, 结算金额必须大于0 if (orderSettleAmount == null || orderSettleAmount.compareTo(BigDecimal.ZERO) <= 0) { logger.info("realTimeOrderSplit-订单[{}]结算金额[{}]必须大于0", afterSettleOrderDTO.getOrderCode(), orderSettleAmount); @@ -2104,7 +2107,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { PaymentConfirmParam param = PaymentConfirmParam.builder() .paymentId(paymentId) .divMemberList(divMemberList) - .confirmAmt(orderSettleAmount) + .confirmAmt(orderSettleAmount.add(insuranceAmount)) // 订单结算金额 + 保险金额 .orderCode(orderCode) .wechatAppId(appId) .build();