Browse Source

fix: 修复PayWalletRechargeCerate参数校验

Jayson Albert 1 year ago
parent
commit
f4ea648ac9

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

@@ -19,7 +19,7 @@ public class AppPayWalletRechargeCreateReqVO {
     private Long packageId;
 
     @AssertTrue(message = "充值金额和充钱套餐不能同时为空")
-    public boolean validatePayPriceAndPackageId() {
+    public boolean isPayPriceAndPackageIdValid() {
         return Objects.nonNull(payPrice) || Objects.nonNull(packageId);
     }
 }

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

@@ -65,10 +65,6 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
     public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, String userIp,
                                                     AppPayWalletRechargeCreateReqVO reqVO) {
 
-        if (Objects.isNull(reqVO.getPayPrice()) && Objects.isNull(reqVO.getPackageId())) {
-            //  TODO @jason @AssertTrue 貌似没有效果。需要查下原因
-            throw exception(WALLET_RECHARGE_PACKAGE_AND_PRICE_IS_EMPTY);
-        }
         // 1.1 计算充值金额
         int payPrice;
         int bonusPrice = 0;