From 3ce8454fcdc0cccdddf7bf86d48493495253e111 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 27 Nov 2023 11:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/common/enums/ykc/ReturnCodeEnum.java | 2 ++ .../java/com/jsowell/pile/dto/ApplyRefundDTO.java | 5 +++++ .../service/impl/MemberBasicInfoServiceImpl.java | 12 +++++++----- .../service/orderlogic/DelayMerchantOrderLogic.java | 12 ++++++++---- .../orderlogic/NotDelayMerchantOrderLogic.java | 13 +++++++++---- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index 720ba5eb5..705e386cc 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -127,6 +127,8 @@ public enum ReturnCodeEnum { // 地锁存在未完成的占桩订单 CODE_HAS_OCCUPY_PILE_ORDER_ERROR("00100059", "当前地锁存在未完成的占桩订单"), + CODE_WALLET_NOT_FOUND_ERROR("00100060", "未查询会员钱包信息"), + /* 个人桩 start */ CODE_PILE_HAS_BEEN_BINDING_ERROR("00400001", "此桩已被绑定，请联系管理员！"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyRefundDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyRefundDTO.java index 8d453e285..8413479e5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyRefundDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyRefundDTO.java @@ -46,4 +46,9 @@ public class ApplyRefundDTO { * 汇付需要merchantKey，取小程序appId传给它 */ private String wechatAppId; + + /** + * 钱包编号 + */ + private String walletCode; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index f5b6dd47f..28834eace 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -213,7 +213,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { } String targetMerchantId = dto.getTargetMerchantId(); // 目标运营商id - log.info("修改用户余额 memberId:{}, updatePrincipalBalance:{}, targetMerchantId:{}", memberId, updatePrincipalBalance, targetMerchantId); + log.info("修改用户余额-memberId:{}, updatePrincipalBalance:{}, targetMerchantId:{}", memberId, updatePrincipalBalance, targetMerchantId); // 来自后管的充值，校验权限 if (StringUtils.equals(dto.getFromWeb(), Constants.ONE)) { @@ -228,7 +228,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { // 查询用户余额 MemberWalletInfo walletInfo = memberWalletInfoService.selectByMemberId(memberId, targetMerchantId); if (walletInfo == null) { - log.warn("根据会员id:{}, 目标运营商id:{}, 查询会员信息为空, 新建会员钱包", memberId, targetMerchantId); + log.warn("修改用户余额-根据会员id:{}, 目标运营商id:{}, 查询会员信息为空, 新建会员钱包", memberId, targetMerchantId); // 如果查询到钱包为空，就新建一个该运营商的钱包 walletInfo = MemberWalletInfo.builder() .walletCode(generateWalletCode()) @@ -262,7 +262,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { : walletInfo.getPrincipalBalance(); newPrincipalBalance = oldPrincipalBalance.add(updatePrincipalBalance); if (newPrincipalBalance.compareTo(BigDecimal.ZERO) < 0) { - log.warn("变更后本金余额不能为负数"); + log.warn("修改用户余额-变更后本金余额不能为负数"); throw new BusinessException("", "变更后本金余额不能为负数"); } // 记流水 @@ -293,7 +293,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { newGiftBalance = oldGiftBalance.add(updateGiftBalance); // 余额不能为负数 if (newGiftBalance.compareTo(BigDecimal.ZERO) < 0) { - log.warn("变更后赠送余额不能为负数"); + log.warn("修改用户余额-变更后赠送余额不能为负数"); throw new BusinessException("", "变更后赠送余额不能为负数"); } // 记流水 @@ -315,9 +315,11 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { // 修改数据库 int i = 0; if (newPrincipalBalance != null || newGiftBalance != null) { + log.info("修改用户余额-memberId:{}, walletCode:{}, newPrincipalBalance:{}, newGiftBalance:{}, version:{}" + , memberId, walletCode, newPrincipalBalance, newGiftBalance, walletInfo.getVersion()); i = memberBasicInfoMapper.updateMemberBalance(memberId, walletCode, newPrincipalBalance, newGiftBalance, walletInfo.getVersion()); if (i == 0) { - log.warn("修改余额失败, memberId:{}", memberId); + log.warn("修改用户余额-修改余额失败, memberId:{}", memberId); } } // 插入 member_wallet_log 表 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 58016594b..ed584c6c1 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 @@ -591,13 +591,17 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { } // 查会员余额 - MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); - if (memberVO == null) { - throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); + // MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); + // if (memberVO == null) { + // throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); + // } + MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByWalletCode(dto.getWalletCode()); + if (memberWalletInfo == null) { + throw new BusinessException(ReturnCodeEnum.CODE_WALLET_NOT_FOUND_ERROR); } // 校验退款金额 - BigDecimal principalBalance = memberVO.getPrincipalBalance(); + BigDecimal principalBalance = memberWalletInfo.getPrincipalBalance(); BigDecimal refundAmount = dto.getRefundAmount(); if (refundAmount.compareTo(principalBalance) > 0) { throw new BusinessException(ReturnCodeEnum.CODE_REFUND_MEMBER_BALANCE_ERROR); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java index 2b2047e23..24748c4d5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java @@ -480,13 +480,18 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ } // 查会员余额 - MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); - if (memberVO == null) { - throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); + // MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); + // if (memberVO == null) { + // throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); + // } + + MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByWalletCode(dto.getWalletCode()); + if (memberWalletInfo == null) { + throw new BusinessException(ReturnCodeEnum.CODE_WALLET_NOT_FOUND_ERROR); } // 校验退款金额 - BigDecimal principalBalance = memberVO.getPrincipalBalance(); + BigDecimal principalBalance = memberWalletInfo.getPrincipalBalance(); BigDecimal refundAmount = dto.getRefundAmount(); if (refundAmount.compareTo(principalBalance) > 0) { throw new BusinessException(ReturnCodeEnum.CODE_REFUND_MEMBER_BALANCE_ERROR);