From fd54ea887141928e5e94be27da80b58a984b4f1e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 23 Nov 2023 11:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderlogic/DelayMerchantOrderLogic.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java index c1785a4b2..58016594b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java @@ -630,6 +630,8 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { logger.info("【{}】-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); // 订单编号 String orderCode = orderBasicInfo.getOrderCode(); + + String merchantId = orderBasicInfo.getMerchantId(); // 订单消费金额 BigDecimal orderAmount = orderBasicInfo.getOrderAmount(); // 查支付记录 @@ -651,6 +653,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { // 更新会员钱包/余额退回到钱包 UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder() .memberId(orderBasicInfo.getMemberId()) + .targetMerchantId(merchantId) .type(MemberWalletEnum.TYPE_IN.getValue()) // 进账 .subType(MemberWalletEnum.SUBTYPE_ORDER_SETTLEMENT_REFUND.getValue()) // 订单结算退款 .updatePrincipalBalance(returnPrincipal) @@ -659,12 +662,12 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO); // 更新order_pay_record, 解冻部分 - List> list = calculateUnfreezeAmount(orderAmount, payRecordList); - for (Map map : list) { - String paymentId = (String) map.get("paymentId"); - BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount"); - memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount); - } + // List> list = calculateUnfreezeAmount(orderAmount, payRecordList); + // for (Map map : list) { + // String paymentId = (String) map.get("paymentId"); + // BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount"); + // memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount); + // } } /**