Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score

# Conflicts:
#	yudao-server/src/main/resources/i18n/messages_en.properties
#	yudao-server/src/main/resources/i18n/messages_zh.properties

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java

@@ -6,14 +6,14 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 // TODO 待办：请将下面的错误码复制到 yudao-module-reward-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
 // ========== 礼品 TODO 补充编号 ==========
 public interface ErrorCodeConstants {
-    ErrorCode REWARD_NOT_EXISTS = new ErrorCode(1010011001, "礼品不存在");
-    ErrorCode REWARD_ENDTIME_ERROR = new ErrorCode(1001011002, "礼品结束时间不能早于当前时间");
-    ErrorCode REWARD_STATUS_NOT_ALLOW_DELETE = new ErrorCode(1001011003, "只有未启用可删除");
-    ErrorCode REWARD_STATUS_NOT_ALLOW_ClOSE = new ErrorCode(1001011004, "未启用礼品不可关闭");
-    ErrorCode REWARD_STATUS_CHANGE_ERROR = new ErrorCode(1001011005, "礼品状态操作不符合规则");
-    ErrorCode REWARD_STATUS_NOT_ALLOW_DELAY = new ErrorCode(1001011006, "只允许延期启用状态礼品");
-    ErrorCode REWARD_STATUS_NOT_ALLOW_CREATE = new ErrorCode(1001011007, "创建的礼品状态只能是启用或未启用");
-    ErrorCode REWARD_START_OR_END_TIME_NOT_ALLOW_CREATE = new ErrorCode(1001011008, "活动时间不合法");
+    ErrorCode REWARD_NOT_EXISTS = new ErrorCode(1010011001, "reward.do.not.exist");
+    ErrorCode REWARD_ENDTIME_ERROR = new ErrorCode(1001011002, "reward.end.time.less.than.now");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_DELETE = new ErrorCode(1001011003, "reward.status.not.allow.delete");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_ClOSE = new ErrorCode(1001011004, "reward.status.not.allow.close");
+    ErrorCode REWARD_STATUS_CHANGE_ERROR = new ErrorCode(1001011005, "reward.status.change.error");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_DELAY = new ErrorCode(1001011006, "reward.status.not.allow.delay");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_CREATE = new ErrorCode(1001011007, "reward.status.not.allow.create");
+    ErrorCode REWARD_START_OR_END_TIME_NOT_ALLOW_CREATE = new ErrorCode(1001011008, "reward.time.not.allow");
     ErrorCode REWARD_PICK_METHOD_NOT_ALLOW_CREATE = new ErrorCode(1001011009, "领取方式不合法");
     ErrorCode REWARD_STATUS_NOT_ALLOW_UPDATE = new ErrorCode(1001011010, "礼物状态不允许编辑");
     ErrorCode REWARD_STATUS_NOT_ALLOW_ENABLE = new ErrorCode(1001011011, "礼物不能启用");

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

@@ -42,7 +42,7 @@ public class RewardController {
         return success(rewardService.create(createReqVO));
     }
 
-    @PutMapping("/update")
+    @PostMapping("/update")
     @ApiOperation("更新礼品")
     //@PreAuthorize("@ss.hasPermission('reward::update')")
     public CommonResult<Boolean> update(@Valid @RequestBody RewardUpdateReqVO updateReqVO) {

yudao-server/src/main/resources/application.yaml

@@ -114,6 +114,7 @@ yudao:
       - cn.iocoder.yudao.module.wealth.enums.ErrorCodeConstants
       - cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants
       - cn.iocoder.yudao.module.system.enums.ErrorCodeConstants
+      - cn.iocoder.yudao.module.reward.enums.ErrorCodeConstants
   tenant: # 多租户相关配置项
     enable: false
     ignore-urls:

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

@@ -1000,4 +1000,13 @@ order.is.pre.installed=Order pre installed
 customer.delay.approval.times.more.then.one=delay approval times more then one
 member.id.is.null=no member ids
 score.count.error= score count must > 0
-member.score.not.enough = member score not enough
\ No newline at end of file
+member.score.not.enough = member score not enough
+
+reward.do.not.exist=The reward does not exist
+reward.end.time.less.than.now=The reward end time is less than the current time
+reward.status.not.allow.delete=Only not enable can delete
+reward.status.not.allow.close=Not enable reward can not close
+reward.status.change.error=The reward status change error
+reward.status.not.allow.delay=Only enable status can delay
+reward.status.not.allow.create=Only enabled or disabled reward status can be created
+reward.time.not.allow=The reward time is not allow
\ No newline at end of file

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

@@ -1004,4 +1004,13 @@ order.is.pre.installed=\u8BA2\u5355\u5DF2\u9884\u88C5
 order.is.not.pre.installed =\u8BA2\u5355\u672A\u88C5\u7BB1\uFF0C\u4E0D\u80FD\u5408\u5305
 member.id.is.null=\u7F3A\u5C11\u4F1A\u5458id
 score.count.error=\u79EF\u5206\u5FC5\u987B > 0
-member.score.not.enough = \u4F1A\u5458\u79EF\u5206\u4E0D\u8DB3
\ No newline at end of file
+member.score.not.enough = \u4F1A\u5458\u79EF\u5206\u4E0D\u8DB3
+
+reward.do.not.exist=\u793C\u54C1\u4E0D\u5B58\u5728
+reward.end.time.less.than.now=\u793C\u54C1\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u65E9\u4E8E\u5F53\u524D\u65F6\u95F4
+reward.status.not.allow.delete=\u53EA\u6709\u672A\u542F\u7528\u53EF\u5220\u9664
+reward.status.not.allow.close=\u672A\u542F\u7528\u793C\u54C1\u4E0D\u53EF\u5173\u95ED
+reward.status.change.error=\u793C\u54C1\u72B6\u6001\u64CD\u4F5C\u4E0D\u7B26\u5408\u89C4\u5219
+reward.status.not.allow.delay=\u53EA\u5141\u8BB8\u5EF6\u671F\u542F\u7528\u72B6\u6001\u793C\u54C1
+reward.status.not.allow.create=\u521B\u5EFA\u7684\u793C\u54C1\u72B6\u6001\u53EA\u80FD\u662F\u542F\u7528\u6216\u672A\u542F\u7528
+reward.time.not.allow=\u6D3B\u52A8\u65F6\u95F4\u4E0D\u5408\u6CD5
\ No newline at end of file