Merge branch 'release-bugfix-166' into 'release'

bugfix-166: 积分不足显示程序码

See merge request !14

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/api/reward/RedeemRewardApiImpl.java

@@ -296,7 +296,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
     private void verifyMemberUser(RedeemRewardReqVO redeemRewardReqVO, RewardDO rewardDO, Integer holdScore) {
         // 会员积分不够
         if (holdScore < rewardDO.getPointsRequire() * redeemRewardReqVO.getRewardCount()) {
-            throw exception(REWARD_SCORE_NOT_ENOUGH, "userId:" + redeemRewardReqVO.getMemberId() + ",holdScore:" + holdScore, "requireScore:" + rewardDO.getPointsRequire() * redeemRewardReqVO.getRewardCount());
+            throw exception(REWARD_SCORE_NOT_ENOUGH);
         }
         // 校验兑换次数
         LambdaQueryWrapper<RewardRedeemDO> rewardRedeemDOWrapper = new LambdaQueryWrapper<>();
@@ -304,7 +304,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
                 .eq(RewardRedeemDO::getMemberId, redeemRewardReqVO.getMemberId());
         Long count = rewardRedeemMapper.selectCount(rewardRedeemDOWrapper);
         if (count >= rewardDO.getAllowCount()) {
-            throw exception(REWARD_REDEEM_ALLOW_COUNT_ERROR, "userId:" + redeemRewardReqVO.getMemberId() + ",rewardId:" + redeemRewardReqVO.getRewardId());
+            throw exception(REWARD_REDEEM_ALLOW_COUNT_ERROR);
         }
     }
 }

yudao-server/src/main/resources/i18n/messages_en.properties

@@ -1033,7 +1033,7 @@ reward.pick.method.not.allow = pick method not allow
 reward.status.not.allow.update = reward status not allow update
 reward.status.not.allow.enable = reward status not allow enable
 reward.not.enable = reward is not enable
-reward.score.not.enough = user score not enough:{}
+reward.score.not.enough = user score not enough
 reward.count.not.enough = reward count not enough
 reward.redeem.count.not.allow = bulk redemption is limited to a maximum of 10 pieces at a time
 reward.redeem.allow.count.error = the number of redemptions allowed by the individual has been exceeded:{}

yudao-server/src/main/resources/i18n/messages_zh.properties

@@ -1024,10 +1024,10 @@ reward.pick.method.not.allow = \u793C\u54C1\u9886\u53D6\u65B9\u5F0F\u4E0D\u652F\
 reward.status.not.allow.update = \u793C\u54C1\u72B6\u6001\u64CD\u4F5C\u4E0D\u7B26\u5408\u89C4\u5219
 reward.status.not.allow.enable = \u793C\u54C1\u4E0D\u5141\u8BB8\u542F\u7528
 reward.not.enable = \u793C\u54C1\u672A\u542F\u7528
-reward.score.not.enough = \u79EF\u5206\u4E0D\u8DB3\uFF1A{}
+reward.score.not.enough = \u79EF\u5206\u4E0D\u8DB3
 reward.count.not.enough = \u793C\u54C1\u6570\u91CF\u4E0D\u8DB3
 reward.redeem.count.not.allow = \u6279\u91CF\u5151\u6362\u6BCF\u6B21\u6700\u591A\u5341\u6761
-reward.redeem.allow.count.error = \u5DF2\u8D85\u51FA\u4E2A\u4EBA\u5141\u8BB8\u5151\u6362\u6B21\u6570\uFF1A{}
+reward.redeem.allow.count.error = \u5DF2\u8D85\u51FA\u4E2A\u4EBA\u5141\u8BB8\u5151\u6362\u6B21\u6570
 reward.node.and.points.list.error = \u521B\u5EFA\u793C\u54C1\u7F51\u70B9\u6216\u6240\u9700\u79EF\u5206\u9519\u8BEF
 reward.redeem.recipient.error = \u793C\u54C1\u6536\u8D27\u4EBA\u4FE1\u606F\u4E0D\u5168
 redeem.import.no.record = \u8868\u683C\u4E2D\u65E0\u8BB0\u5F55