Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
edcc406b
Commit
edcc406b
authored
Jul 25, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-reward:调整更新接口
parent
9514f8b4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
9 deletions
+27
-9
ErrorCodeConstants.java
...iocoder/yudao/module/reward/enums/ErrorCodeConstants.java
+8
-8
RewardController.java
...dule/reward/controller/admin/reward/RewardController.java
+1
-1
application.yaml
yudao-server/src/main/resources/application.yaml
+1
-0
messages_en.properties
yudao-server/src/main/resources/i18n/messages_en.properties
+8
-0
messages_zh.properties
yudao-server/src/main/resources/i18n/messages_zh.properties
+9
-0
No files found.
yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java
View file @
edcc406b
...
@@ -6,14 +6,14 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
...
@@ -6,14 +6,14 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
// TODO 待办:请将下面的错误码复制到 yudao-module-reward-api 模块的 ErrorCodeConstants 类中。注意,请给“TODO 补充编号”设置一个错误码编号!!!
// TODO 待办:请将下面的错误码复制到 yudao-module-reward-api 模块的 ErrorCodeConstants 类中。注意,请给“TODO 补充编号”设置一个错误码编号!!!
// ========== 礼品 TODO 补充编号 ==========
// ========== 礼品 TODO 补充编号 ==========
public
interface
ErrorCodeConstants
{
public
interface
ErrorCodeConstants
{
ErrorCode
REWARD_NOT_EXISTS
=
new
ErrorCode
(
1010011001
,
"
礼品不存在
"
);
ErrorCode
REWARD_NOT_EXISTS
=
new
ErrorCode
(
1010011001
,
"
reward.do.not.exist
"
);
ErrorCode
REWARD_ENDTIME_ERROR
=
new
ErrorCode
(
1001011002
,
"
礼品结束时间不能早于当前时间
"
);
ErrorCode
REWARD_ENDTIME_ERROR
=
new
ErrorCode
(
1001011002
,
"
reward.end.time.less.than.now
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_DELETE
=
new
ErrorCode
(
1001011003
,
"
只有未启用可删除
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_DELETE
=
new
ErrorCode
(
1001011003
,
"
reward.status.not.allow.delete
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_ClOSE
=
new
ErrorCode
(
1001011004
,
"
未启用礼品不可关闭
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_ClOSE
=
new
ErrorCode
(
1001011004
,
"
reward.status.not.allow.close
"
);
ErrorCode
REWARD_STATUS_CHANGE_ERROR
=
new
ErrorCode
(
1001011005
,
"
礼品状态操作不符合规则
"
);
ErrorCode
REWARD_STATUS_CHANGE_ERROR
=
new
ErrorCode
(
1001011005
,
"
reward.status.change.error
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_DELAY
=
new
ErrorCode
(
1001011006
,
"
只允许延期启用状态礼品
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_DELAY
=
new
ErrorCode
(
1001011006
,
"
reward.status.not.allow.delay
"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_CREATE
=
new
ErrorCode
(
1001011007
,
"
创建的礼品状态只能是启用或未启用
"
);
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
,
"
活动时间不合法
"
);
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_PICK_METHOD_NOT_ALLOW_CREATE
=
new
ErrorCode
(
1001011009
,
"领取方式不合法"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_UPDATE
=
new
ErrorCode
(
1001011010
,
"礼物状态不允许编辑"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_UPDATE
=
new
ErrorCode
(
1001011010
,
"礼物状态不允许编辑"
);
ErrorCode
REWARD_STATUS_NOT_ALLOW_ENABLE
=
new
ErrorCode
(
1001011011
,
"礼物不能启用"
);
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
View file @
edcc406b
...
@@ -42,7 +42,7 @@ public class RewardController {
...
@@ -42,7 +42,7 @@ public class RewardController {
return
success
(
rewardService
.
create
(
createReqVO
));
return
success
(
rewardService
.
create
(
createReqVO
));
}
}
@P
u
tMapping
(
"/update"
)
@P
os
tMapping
(
"/update"
)
@ApiOperation
(
"更新礼品"
)
@ApiOperation
(
"更新礼品"
)
//@PreAuthorize("@ss.hasPermission('reward::update')")
//@PreAuthorize("@ss.hasPermission('reward::update')")
public
CommonResult
<
Boolean
>
update
(
@Valid
@RequestBody
RewardUpdateReqVO
updateReqVO
)
{
public
CommonResult
<
Boolean
>
update
(
@Valid
@RequestBody
RewardUpdateReqVO
updateReqVO
)
{
...
...
yudao-server/src/main/resources/application.yaml
View file @
edcc406b
...
@@ -114,6 +114,7 @@ yudao:
...
@@ -114,6 +114,7 @@ yudao:
-
cn.iocoder.yudao.module.wealth.enums.ErrorCodeConstants
-
cn.iocoder.yudao.module.wealth.enums.ErrorCodeConstants
-
cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants
-
cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants
-
cn.iocoder.yudao.module.system.enums.ErrorCodeConstants
-
cn.iocoder.yudao.module.system.enums.ErrorCodeConstants
-
cn.iocoder.yudao.module.reward.enums.ErrorCodeConstants
tenant
:
# 多租户相关配置项
tenant
:
# 多租户相关配置项
enable
:
false
enable
:
false
ignore-urls
:
ignore-urls
:
...
...
yudao-server/src/main/resources/i18n/messages_en.properties
View file @
edcc406b
...
@@ -999,3 +999,11 @@ customer.is.new.or.old.no.change=customer current business type is {}, it's no c
...
@@ -999,3 +999,11 @@ customer.is.new.or.old.no.change=customer current business type is {}, it's no c
order.is.pre.installed
=
Order pre installed
order.is.pre.installed
=
Order pre installed
customer.delay.approval.times.more.then.one
=
delay approval times more then one
customer.delay.approval.times.more.then.one
=
delay approval times more then one
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
View file @
edcc406b
...
@@ -1002,3 +1002,12 @@ order.already.in.merge.pkg=\u8BA2\u5355\u5DF2\u5728\u5408\u5305\u7BB1\u4E0B
...
@@ -1002,3 +1002,12 @@ order.already.in.merge.pkg=\u8BA2\u5355\u5DF2\u5728\u5408\u5305\u7BB1\u4E0B
customer.is.new.or.old.no.change
=
\u
5BA2
\u6237\u
5F53
\u
524D
\u
4E1A
\u
7EE9
\u
7C7B
\u
578B
\u
662F{}
\u
5BA2
\u6237\u
FF0C
\u
4E0D
\u9700\u8981\u
66F4
\u
65B0
customer.is.new.or.old.no.change
=
\u
5BA2
\u6237\u
5F53
\u
524D
\u
4E1A
\u
7EE9
\u
7C7B
\u
578B
\u
662F{}
\u
5BA2
\u6237\u
FF0C
\u
4E0D
\u9700\u8981\u
66F4
\u
65B0
order.is.pre.installed
=
\u
8BA2
\u5355\u
5DF2
\u9884\u
88C5
order.is.pre.installed
=
\u
8BA2
\u5355\u
5DF2
\u9884\u
88C5
order.is.not.pre.installed
=
\u
8BA2
\u5355\u
672A
\u
88C5
\u
7BB1
\u
FF0C
\u
4E0D
\u
80FD
\u5408\u5305
order.is.not.pre.installed
=
\u
8BA2
\u5355\u
672A
\u
88C5
\u
7BB1
\u
FF0C
\u
4E0D
\u
80FD
\u5408\u5305
reward.do.not.exist
=
\u
793C
\u
54C1
\u
4E0D
\u
5B58
\u5728
reward.end.time.less.than.now
=
\u
793C
\u
54C1
\u
7ED3
\u
675F
\u
65F6
\u
95F4
\u
4E0D
\u
80FD
\u
65E9
\u
4E8E
\u
5F53
\u
524D
\u
65F6
\u
95F4
reward.status.not.allow.delete
=
\u
53EA
\u6709\u
672A
\u
542F
\u7528\u
53EF
\u5220\u9664
reward.status.not.allow.close
=
\u
672A
\u
542F
\u7528\u
793C
\u
54C1
\u
4E0D
\u
53EF
\u5173\u
95ED
reward.status.change.error
=
\u
793C
\u
54C1
\u
72B6
\u6001\u
64CD
\u
4F5C
\u
4E0D
\u
7B26
\u5408\u
89C4
\u5219
reward.status.not.allow.delay
=
\u
53EA
\u5141\u
8BB8
\u
5EF6
\u
671F
\u
542F
\u7528\u
72B6
\u6001\u
793C
\u
54C1
reward.status.not.allow.create
=
\u
521B
\u
5EFA
\u7684\u
793C
\u
54C1
\u
72B6
\u6001\u
53EA
\u
80FD
\u
662F
\u
542F
\u7528\u6216\u
672A
\u
542F
\u7528
reward.time.not.allow
=
\u
6D3B
\u
52A8
\u
65F6
\u
95F4
\u
4E0D
\u5408\u
6CD5
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment