huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2025-01-31 09:30:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!698 fix: 修复PayWalletRechargeCerate参数校验

Browse Source 
Merge pull request !698 from JaysonAlbert/fix/validate-pay-wallet
This commit is contained in:
芋道源码 2023-10-29 13:07:18 +00:00 committed by Gitee
commit 87fb47ca6a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
View File

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

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

@ -65,10 +65,6 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, String userIp, public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, String userIp,
AppPayWalletRechargeCreateReqVO reqVO) { 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 计算充值金额 // 1.1 计算充值金额
int payPrice; int payPrice;
int bonusPrice = 0; int bonusPrice = 0;