Jelajahi Sumber

code review:钱包充值

YunaiV 1 tahun lalu
induk
melakukan
080c32b9f3
15 mengubah file dengan 104 tambahan dan 70 penghapusan
  1. 3 0
      yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  2. 11 7
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletRechargeController.java
  3. 3 0
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
  4. 1 0
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateRespVO.java
  5. 1 0
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletRechargeConvert.java
  6. 2 2
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletTransactionConvert.java
  7. 24 12
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/wallet/PayWalletRechargeDO.java
  8. 3 0
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletMapper.java
  9. 3 3
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletRechargeMapper.java
  10. 9 6
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeService.java
  11. 24 18
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
  12. 14 16
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
  13. 3 3
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionService.java
  14. 2 2
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java
  15. 1 1
      yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/WalletTransactionCreateReqBO.java

+ 3 - 0
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java

@@ -46,6 +46,9 @@ public interface ErrorCodeConstants {
     ErrorCode WALLET_TRANSACTION_NOT_FOUND = new ErrorCode(1007007002, "未找到对应的钱包交易");
     ErrorCode WALLET_REFUND_AMOUNT_ERROR = new ErrorCode(1007007003, "钱包退款金额不对");
     ErrorCode WALLET_REFUND_EXIST = new ErrorCode(1007007004, "已经存在钱包退款");
+
+    // TODO @jason:把钱包充值,单独搞个错误码段哈;
+
     ErrorCode WALLET_RECHARGE_NOT_FOUND = new ErrorCode(1007007005, "钱包充值记录不存在");
     ErrorCode WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007007006, "钱包充值更新支付状态失败,钱包充值记录不是【未支付】状态");
     ErrorCode WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR = new ErrorCode(1007007007, "钱包充值更新支付状态失败,支付单编号不匹配");

+ 11 - 7
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletRechargeController.java

@@ -33,13 +33,14 @@ import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLogi
 public class AppPayWalletRechargeController {
 
     @Resource
-    private PayWalletRechargeService payWalletRechargeService;
+    private PayWalletRechargeService walletRechargeService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建钱包充值记录")
-    public CommonResult<AppPayWalletRechargeCreateRespVO> createWalletRecharge(@Valid @RequestBody AppPayWalletRechargeCreateReqVO reqVO) {
-        PayWalletRechargeDO walletRecharge = payWalletRechargeService.createWalletRecharge(getLoginUserId(),
-                getLoginUserType(), reqVO);
+    @Operation(summary = "创建钱包充值记录(发起充值)")
+    public CommonResult<AppPayWalletRechargeCreateRespVO> createWalletRecharge(
+            @Valid @RequestBody AppPayWalletRechargeCreateReqVO reqVO) {
+        PayWalletRechargeDO walletRecharge = walletRechargeService.createWalletRecharge(
+                getLoginUserId(), getLoginUserType(), reqVO);
         return success(PayWalletRechargeConvert.INSTANCE.convert(walletRecharge));
     }
 
@@ -47,9 +48,12 @@ public class AppPayWalletRechargeController {
     @Operation(summary = "更新钱包充值为已充值") // 由 pay-module 支付服务,进行回调,可见 PayNotifyJob
     @PermitAll // 无需登录,安全由 内部校验实现
     @OperateLog(enable = false) // 禁用操作日志,因为没有操作人
-    public CommonResult<Boolean> updateWalletRechargerPaid(@RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
-        payWalletRechargeService.updateWalletRechargerPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
+    public CommonResult<Boolean> updateWalletRechargerPaid(@Valid @RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
+        walletRechargeService.updateWalletRechargerPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
                 notifyReqDTO.getPayOrderId());
         return success(true);
     }
+
+    // TODO @jason:管理后台,是不是可以搞个发起退款;
+
 }

+ 3 - 0
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java

@@ -12,11 +12,14 @@ public class AppPayWalletRechargeCreateReqVO {
 
     @Schema(description = "支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
     @NotNull(message = "支付金额不能为空")
+    // TODO @jason999:是不是 @Min 哈?
     @DecimalMin(value = "0", inclusive = false, message = "支付金额必须大于零")
     private Integer payPrice;
 
+    // TODO @jason:这个是不是后端计算出来呀?不然前端可以直接搞了。。。
     @Schema(description = "钱包赠送金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
     @NotNull(message = "钱包赠送金额不能为空")
     @DecimalMin(value = "0",  message = "钱包赠送金额必须大于等于零")
     private Integer walletBonus;
+
 }

+ 1 - 0
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateRespVO.java

@@ -12,4 +12,5 @@ public class AppPayWalletRechargeCreateRespVO {
 
     @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Long payOrderId;
+
 }

+ 1 - 0
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletRechargeConvert.java

@@ -16,6 +16,7 @@ public interface PayWalletRechargeConvert {
 
     PayWalletRechargeDO convert(AppPayWalletRechargeCreateReqVO vo);
 
+    // TODO @jason:好像 price 相加,可以写个表达式的,通过 @Mapping
     default PayWalletRechargeDO convert(Long walletId, AppPayWalletRechargeCreateReqVO vo) {
         PayWalletRechargeDO walletRecharge = convert(vo);
         return walletRecharge.setWalletId(walletId)

+ 2 - 2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletTransactionConvert.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.pay.convert.wallet;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionRespVO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -14,6 +14,6 @@ public interface PayWalletTransactionConvert {
 
     PageResult<AppPayWalletTransactionRespVO> convertPage(PageResult<PayWalletTransactionDO> page);
 
-    PayWalletTransactionDO convert(CreateWalletTransactionBO bean);
+    PayWalletTransactionDO convert(WalletTransactionCreateReqBO bean);
 
 }

+ 24 - 12
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/wallet/PayWalletRechargeDO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.pay.dal.dataobject.wallet;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
+import cn.iocoder.yudao.module.pay.dal.dataobject.refund.PayRefundDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,40 +25,49 @@ public class PayWalletRechargeDO extends BaseDO {
     private Long id;
 
     /**
-     * 会员钱包 id
+     * 钱包编号
+     *
+     * 关联 {@link PayWalletDO#getId()}
      */
     private Long walletId;
 
+    // TODO @jason:要不改成 totalPrice?
     /**
-     * 用户实际到账余额,例如充 100 送 20,则该值是 120
+     * 用户实际到账余额
+     *
+     * 例如充 100 送 20,则该值是 120
      */
     private Integer price;
-
     /**
      * 实际支付金额
      */
     private Integer payPrice;
-
+    // TODO @jason:bonusPrice 哈,更统一一点;
     /**
      * 钱包赠送金额
      */
     private Integer walletBonus;
 
     /**
-     * 是否已支付:[0:未支付 1:已经支付过]
+     * 是否已支付
+     *
+     * true - 已支付
+     * false - 未支付
      */
     private Boolean payStatus;
 
     /**
      * 支付订单编号
+     *
+     * 关联 {@link PayOrderDO#getId()}
      */
     private Long payOrderId;
-
     /**
      * 支付成功的支付渠道
+     *
+     * 冗余 {@link PayOrderDO#getChannelCode()}
      */
     private String payChannelCode;
-
     /**
      * 订单支付时间
      */
@@ -64,26 +75,27 @@ public class PayWalletRechargeDO extends BaseDO {
 
     /**
      * 支付退款单编号
+     *
+     * 关联 {@link PayRefundDO#getId()}
      */
     private Long payRefundId;
-
+    // TODO @jason:要不改成 refundTotalPrice?
     /**
      * 退款金额,包含赠送金额
      */
     private Integer refundPrice;
-
     /**
      * 退款支付金额
      */
     private Integer refundPayPrice;
-
+    // TODO @jason:要不改成 refundBonusPrice?
     /**
      * 退款钱包赠送金额
      */
     private Integer refundWalletBonus;
-
     /**
      * 退款时间
      */
     private LocalDateTime refundTime;
-}
+
+}

+ 3 - 0
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletMapper.java

@@ -14,6 +14,8 @@ public interface PayWalletMapper extends BaseMapperX<PayWalletDO> {
                 PayWalletDO::getUserType, userType);
     }
 
+    // TODO @jason:下面几个更新方法,把 id 放前面哈。一般来说,重要参数放前面;
+
     /**
      * 当消费退款时候, 更新钱包
      *
@@ -55,6 +57,7 @@ public interface PayWalletMapper extends BaseMapperX<PayWalletDO> {
                 .eq(PayWalletDO::getId, id);
         return update(null, lambdaUpdateWrapper);
     }
+    
 }
 
 

+ 3 - 3
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletRechargeMapper.java

@@ -2,17 +2,17 @@ package cn.iocoder.yudao.module.pay.dal.mysql.wallet;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.pay.dal.dataobject.demo.PayDemoOrderDO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface PayWalletRechargeMapper extends BaseMapperX<PayWalletRechargeDO> {
 
-    default  int updateByIdAndPaid(Long id, boolean wherePayed, PayWalletRechargeDO updateObj){
+    default  int updateByIdAndPaid(Long id, boolean wherePayStatus, PayWalletRechargeDO updateObj){
         return update(updateObj, new LambdaQueryWrapperX<PayWalletRechargeDO>()
-                .eq(PayWalletRechargeDO::getId, id).eq(PayWalletRechargeDO::getPayStatus, wherePayed));
+                .eq(PayWalletRechargeDO::getId, id).eq(PayWalletRechargeDO::getPayStatus, wherePayStatus));
     }
+
 }
 
 

+ 9 - 6
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeService.java

@@ -11,19 +11,22 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
 public interface PayWalletRechargeService {
 
     /**
-     * 创建钱包充值记录
+     * 创建钱包充值记录(发起充值)
+     *
      * @param userId 用户 id
      * @param userType 用户类型
-     * @param vo 钱包充值请求 vo
+     * @param createReqVO 钱包充值请求 VO
      * @return 钱包充值记录
      */
-    PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, AppPayWalletRechargeCreateReqVO vo);
-
+    PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType,
+                                             AppPayWalletRechargeCreateReqVO createReqVO);
 
     /**
      * 更新钱包充值成功
-     * @param walletRechargeId 钱包充值 id
+     *
+     * @param id 钱包充值记录 id
      * @param payOrderId 支付订单 id
      */
-    void updateWalletRechargerPaid(Long walletRechargeId, Long payOrderId);
+    void updateWalletRechargerPaid(Long id, Long payOrderId);
+
 }

+ 24 - 18
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java

@@ -42,57 +42,61 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
 
     @Resource
     private PayWalletRechargeMapper walletRechargeMapper;
+
     @Resource
     private PayWalletService payWalletService;
     @Resource
     private PayOrderService payOrderService;
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, AppPayWalletRechargeCreateReqVO vo) {
-        // 1. 获取钱包
+    public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType,
+                                                    AppPayWalletRechargeCreateReqVO createReqVO) {
+        // 1. 新增钱包充值记录
         PayWalletDO wallet = payWalletService.getOrCreateWallet(userId, userType);
-        // 2. 新增钱包充值记录
-        PayWalletRechargeDO walletRecharge = PayWalletRechargeConvert.INSTANCE.convert(wallet.getId(), vo);
+        PayWalletRechargeDO walletRecharge = PayWalletRechargeConvert.INSTANCE.convert(wallet.getId(), createReqVO);
         walletRechargeMapper.insert(walletRecharge);
-        // 3.创建支付单
+
+        // 2.1 创建支付单
         Long payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO()
                 .setAppId(WALLET_PAY_APP_ID).setUserIp(getClientIP())
                 .setMerchantOrderId(walletRecharge.getId().toString()) // 业务的订单编号
                 .setSubject(WALLET_RECHARGE_ORDER_SUBJECT).setBody("").setPrice(walletRecharge.getPayPrice())
                 .setExpireTime(addTime(Duration.ofHours(2L))));
-        // 4.更新钱包充值记录中支付订单
+        // 2.2 更新钱包充值记录中支付订单
         walletRechargeMapper.updateById(new PayWalletRechargeDO().setPayOrderId(payOrderId)
                 .setId(walletRecharge.getId()));
+        // TODO @jason:是不是你直接返回就好啦;然后 payOrderId 设置下;
         return walletRechargeMapper.selectById(walletRecharge.getId());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateWalletRechargerPaid(Long walletRechargeId, Long payOrderId) {
-        // 1. 获取钱包充值记录
-        PayWalletRechargeDO walletRecharge = walletRechargeMapper.selectById(walletRechargeId);
+    public void updateWalletRechargerPaid(Long id, Long payOrderId) {
+        // 1.1 获取钱包充值记录
+        PayWalletRechargeDO walletRecharge = walletRechargeMapper.selectById(id);
         if (walletRecharge == null) {
-            log.error("[updateWalletRechargerPaid],钱包充值记录不存在,钱包充值 Id:{} ", walletRechargeId);
+            log.error("[updateWalletRechargerPaid][钱包充值记录不存在,钱包充值记录 id({})]", id);
             throw exception(WALLET_RECHARGE_NOT_FOUND);
         }
-        // 2. 校验钱包充值是否可以支付
+        // 1.2 校验钱包充值是否可以支付
         PayOrderDO payOrderDO = validateWalletRechargerCanPaid(walletRecharge, payOrderId);
-        // 3. 更新钱包充值的支付状态
-        int updateCount = walletRechargeMapper.updateByIdAndPaid(walletRechargeId,false, new PayWalletRechargeDO().setId(walletRechargeId)
-                .setPayStatus(true).setPayTime(LocalDateTime.now())
+
+        // 2. 更新钱包充值的支付状态
+        int updateCount = walletRechargeMapper.updateByIdAndPaid(id,false,
+                new PayWalletRechargeDO().setId(id).setPayStatus(true).setPayTime(LocalDateTime.now())
                 .setPayChannelCode(payOrderDO.getChannelCode()));
         if (updateCount == 0) {
             throw exception(WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID);
         }
-        // 4. 更新钱包余额
-        payWalletService.addWalletBalance(walletRecharge.getWalletId(), String.valueOf(walletRechargeId),
+
+        // 3. 更新钱包余额
+        // TODO @jason:这样的话,未来提现会不会把充值的,也提现走哈。类似先充 100,送 110;然后提现 110;
+        payWalletService.addWalletBalance(walletRecharge.getWalletId(), String.valueOf(id),
                 PayWalletBizTypeEnum.RECHARGE, walletRecharge.getPrice());
     }
 
     private PayOrderDO validateWalletRechargerCanPaid(PayWalletRechargeDO walletRecharge, Long payOrderId) {
-
         // 1.1 校验充值记录的支付状态
         if (walletRecharge.getPayStatus()) {
             log.error("[validateWalletRechargerCanPaid][钱包({}) 不处于未支付状态!  钱包数据是:{}]",
@@ -105,6 +109,7 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
                     walletRecharge.getId(), payOrderId, toJsonString(walletRecharge));
             throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR);
         }
+
         // 2.1 校验支付单是否存在
         PayOrderDO payOrder = payOrderService.getOrder(payOrderId);
         if (payOrder == null) {
@@ -132,4 +137,5 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
         }
         return payOrder;
     }
+
 }

+ 14 - 16
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java

@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletMapper;
 import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
 import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -84,6 +84,7 @@ public class PayWalletServiceImpl implements  PayWalletService {
         Long walletId = validateWalletCanRefund(payRefund.getId(), payRefund.getChannelOrderNo(),  refundPrice);
         PayWalletDO wallet = walletMapper.selectById(walletId);
         Assert.notNull(wallet, "钱包 {} 不存在", walletId);
+
         // 2. 增加余额
         return addWalletBalance(walletId, String.valueOf(payRefund.getId()), PAYMENT_REFUND, refundPrice);
     }
@@ -137,42 +138,39 @@ public class PayWalletServiceImpl implements  PayWalletService {
         }
         // 2.2 生成钱包流水
         Integer afterBalance = payWallet.getBalance() - price;
-        CreateWalletTransactionBO bo = new CreateWalletTransactionBO().setWalletId(payWallet.getId())
+        WalletTransactionCreateReqBO bo = new WalletTransactionCreateReqBO().setWalletId(payWallet.getId())
                 .setPrice(-price).setBalance(afterBalance).setBizId(String.valueOf(bizId))
                 .setBizType(bizType.getType()).setTitle(bizType.getDescription());
         return walletTransactionService.createWalletTransaction(bo);
     }
 
     @Override
-    public PayWalletTransactionDO addWalletBalance(Long walletId,
-                                                   String bizId, PayWalletBizTypeEnum bizType, Integer price) {
-        // 1. 获取钱包
+    public PayWalletTransactionDO addWalletBalance(Long walletId, String bizId,
+                                                   PayWalletBizTypeEnum bizType, Integer price) {
+        // 1.1 获取钱包
         PayWalletDO payWallet = getWallet(walletId);
-
         if (payWallet == null) {
             log.error("[addWalletBalance],用户钱包({})不存在.", walletId);
             throw exception(WALLET_NOT_FOUND);
         }
-
+        // 1.2 更新钱包金额
         switch (bizType) {
-            case PAYMENT_REFUND: {
-                // 退款更新
+            case PAYMENT_REFUND: { // 退款更新
                 walletMapper.updateWhenConsumptionRefund(price, payWallet.getId());
                 break;
             }
-            case RECHARGE: {
-                // 充值更新
+            case RECHARGE: { // 充值更新
                 walletMapper.updateWhenRecharge(price, payWallet.getId());
                 break;
             }
-            // TODO 其它类型
+            // TODO 其它类型;这里可以先跑异常;避免有业务搞错;
         }
 
         // 2. 生成钱包流水
-        CreateWalletTransactionBO bo = new CreateWalletTransactionBO().setWalletId(payWallet.getId())
-                .setPrice(price).setBalance(payWallet.getBalance()+price).setBizId(bizId)
-                .setBizType(bizType.getType()).setTitle(bizType.getDescription());
-        return walletTransactionService.createWalletTransaction(bo);
+        WalletTransactionCreateReqBO transactionCreateReqBO = new WalletTransactionCreateReqBO()
+                .setWalletId(payWallet.getId()).setPrice(price).setBalance(payWallet.getBalance() + price)
+                .setBizId(bizId).setBizType(bizType.getType()).setTitle(bizType.getDescription());
+        return walletTransactionService.createWalletTransaction(transactionCreateReqBO);
     }
 
 }

+ 3 - 3
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionService.java

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionPageReqVO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
 import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 
 import javax.validation.Valid;
 
@@ -31,7 +31,7 @@ public interface PayWalletTransactionService {
      * @param bo 创建钱包流水 bo
      * @return 新建的钱包 do
      */
-    PayWalletTransactionDO createWalletTransaction(@Valid CreateWalletTransactionBO bo);
+    PayWalletTransactionDO createWalletTransaction(@Valid WalletTransactionCreateReqBO bo);
 
     /**
      * 根据 no,获取钱包余流水
@@ -48,5 +48,5 @@ public interface PayWalletTransactionService {
      * @return 钱包流水
      */
     PayWalletTransactionDO getWalletTransaction(String bizId, PayWalletBizTypeEnum type);
-    
+
 }

+ 2 - 2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
 import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletTransactionMapper;
 import cn.iocoder.yudao.module.pay.dal.redis.no.PayNoRedisDAO;
 import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -43,7 +43,7 @@ public class PayWalletTransactionServiceImpl implements PayWalletTransactionServ
     }
 
     @Override
-    public PayWalletTransactionDO createWalletTransaction(CreateWalletTransactionBO bo) {
+    public PayWalletTransactionDO createWalletTransaction(WalletTransactionCreateReqBO bo) {
         PayWalletTransactionDO transaction = PayWalletTransactionConvert.INSTANCE.convert(bo)
                 .setNo(noRedisDAO.generate(WALLET_NO_PREFIX));
         payWalletTransactionMapper.insert(transaction);

+ 1 - 1
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/CreateWalletTransactionBO.java → yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/WalletTransactionCreateReqBO.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @author jason
  */
 @Data
-public class CreateWalletTransactionBO {
+public class WalletTransactionCreateReqBO {
 
     // TODO @jason:bo 的话,最好加个参数校验哈;