From 4339a9be9aae973339359ee5f7d9f52223c3e6c8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 23 Aug 2023 11:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E9=80=80=E6=AC=BE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/OrderService.java | 18 +++++++++--------- .../impl/OrderBasicInfoServiceImpl.java | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) 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 c8c6e064c..ddd98e0bb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1126,15 +1126,15 @@ public class OrderService { log.info("支付撤销成功 data:{}", JSON.toJSONString(data)); JSONObject jsonObject = JSON.parseObject(data); JSONObject reason = jsonObject.getJSONObject("reason"); - if (ScenarioEnum.BALANCE.getValue().equals(reason.getString("scenarioType"))) { - // 这笔支付订单原来是充值余额的，退款成功了，需要扣掉会员的本金金额 - UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO(); - dto.setMemberId(reason.getString("memberId")); - dto.setUpdatePrincipalBalance(new BigDecimal(jsonObject.getString("reverse_amt"))); // 更新会员本金金额，单位元 - dto.setType(MemberWalletEnum.TYPE_OUT.getValue()); - dto.setSubType(MemberWalletEnum.SUBTYPE_USER_REFUND.getValue()); - memberBasicInfoService.updateMemberBalance(dto); - } + // if (ScenarioEnum.BALANCE.getValue().equals(reason.getString("scenarioType"))) { + // // 这笔支付订单原来是充值余额的，退款成功了，需要扣掉会员的本金金额 + // UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO(); + // dto.setMemberId(reason.getString("memberId")); + // dto.setUpdatePrincipalBalance(new BigDecimal(jsonObject.getString("reverse_amt"))); // 更新会员本金金额，单位元 + // dto.setType(MemberWalletEnum.TYPE_OUT.getValue()); + // dto.setSubType(MemberWalletEnum.SUBTYPE_USER_REFUND.getValue()); + // memberBasicInfoService.updateMemberBalance(dto); + // } } 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 69daa54cb..4094b0367 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 @@ -2380,6 +2380,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { throw new BusinessException(ReturnCodeEnum.CODE_REFUND_MEMBER_BALANCE_ERROR); } + // 扣余额 + UpdateMemberBalanceDTO updateMemberBalanceDTO = new UpdateMemberBalanceDTO(); + updateMemberBalanceDTO.setMemberId(dto.getMemberId()); + updateMemberBalanceDTO.setUpdatePrincipalBalance(refundAmount); // 更新会员本金金额，单位元 + updateMemberBalanceDTO.setType(MemberWalletEnum.TYPE_OUT.getValue()); + updateMemberBalanceDTO.setSubType(MemberWalletEnum.SUBTYPE_USER_REFUND.getValue()); + memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO); + // 查询用户充值余额订单 过滤掉已经退款的充值订单 List list = calculateTheBalanceDeductionAmount(dto.getMemberId(), refundAmount); for (BalanceDeductionAmountVO vo : list) {