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); + // } } /**