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
f50003d7
Commit
f50003d7
authored
Oct 15, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(member): 积分相关权限校验取消
parent
22df8817
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
ScoreRuleController.java
...ember/controller/admin/scoreRule/ScoreRuleController.java
+11
-11
MemberUserScoreController.java
...controller/admin/userScore/MemberUserScoreController.java
+2
-2
MemberUserScoreLogController.java
...ller/admin/userScoreLog/MemberUserScoreLogController.java
+1
-1
No files found.
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/scoreRule/ScoreRuleController.java
View file @
f50003d7
...
@@ -48,14 +48,14 @@ public class ScoreRuleController {
...
@@ -48,14 +48,14 @@ public class ScoreRuleController {
@PostMapping
(
"/create"
)
@PostMapping
(
"/create"
)
@ApiOperation
(
"创建积分规则"
)
@ApiOperation
(
"创建积分规则"
)
@Idempotent
(
timeout
=
3
)
@Idempotent
(
timeout
=
3
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:create')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:create')")
public
CommonResult
<
Long
>
createScoreRule
(
@Valid
@RequestBody
ScoreRuleCreateReqVO
createReqVO
)
{
public
CommonResult
<
Long
>
createScoreRule
(
@Valid
@RequestBody
ScoreRuleCreateReqVO
createReqVO
)
{
return
success
(
scoreRuleService
.
createScoreRule
(
createReqVO
));
return
success
(
scoreRuleService
.
createScoreRule
(
createReqVO
));
}
}
@PostMapping
(
"/update"
)
@PostMapping
(
"/update"
)
@ApiOperation
(
"更新积分规则"
)
@ApiOperation
(
"更新积分规则"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:update')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
public
CommonResult
<
Boolean
>
updateScoreRule
(
@Valid
@RequestBody
ScoreRuleUpdateReqVO
updateReqVO
)
{
public
CommonResult
<
Boolean
>
updateScoreRule
(
@Valid
@RequestBody
ScoreRuleUpdateReqVO
updateReqVO
)
{
scoreRuleService
.
updateScoreRule
(
updateReqVO
);
scoreRuleService
.
updateScoreRule
(
updateReqVO
);
return
success
(
true
);
return
success
(
true
);
...
@@ -63,7 +63,7 @@ public class ScoreRuleController {
...
@@ -63,7 +63,7 @@ public class ScoreRuleController {
@PostMapping
(
"/delete"
)
@PostMapping
(
"/delete"
)
@ApiOperation
(
"删除积分规则"
)
@ApiOperation
(
"删除积分规则"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:delete')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:delete')")
public
CommonResult
<
Boolean
>
deleteScoreRule
(
@Valid
@RequestBody
IdReqVo
idReqVo
)
{
public
CommonResult
<
Boolean
>
deleteScoreRule
(
@Valid
@RequestBody
IdReqVo
idReqVo
)
{
scoreRuleService
.
deleteScoreRule
(
idReqVo
.
getId
());
scoreRuleService
.
deleteScoreRule
(
idReqVo
.
getId
());
return
success
(
true
);
return
success
(
true
);
...
@@ -71,7 +71,7 @@ public class ScoreRuleController {
...
@@ -71,7 +71,7 @@ public class ScoreRuleController {
@PostMapping
(
"/get"
)
@PostMapping
(
"/get"
)
@ApiOperation
(
"获得积分规则详情"
)
@ApiOperation
(
"获得积分规则详情"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:query')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:query')")
public
CommonResult
<
ScoreRuleBackDetailVO
>
getScoreRule
(
@Valid
@RequestBody
IdReqVo
idReqVo
)
{
public
CommonResult
<
ScoreRuleBackDetailVO
>
getScoreRule
(
@Valid
@RequestBody
IdReqVo
idReqVo
)
{
ScoreRuleBackDetailVO
scoreRuleBackDetailVO
=
scoreRuleService
.
getScoreRule
(
idReqVo
.
getId
());
ScoreRuleBackDetailVO
scoreRuleBackDetailVO
=
scoreRuleService
.
getScoreRule
(
idReqVo
.
getId
());
return
success
(
scoreRuleBackDetailVO
);
return
success
(
scoreRuleBackDetailVO
);
...
@@ -80,7 +80,7 @@ public class ScoreRuleController {
...
@@ -80,7 +80,7 @@ public class ScoreRuleController {
@PostMapping
(
"/list"
)
@PostMapping
(
"/list"
)
@ApiOperation
(
"获得积分规则列表"
)
@ApiOperation
(
"获得积分规则列表"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"编号列表"
,
required
=
true
,
example
=
"1024,2048"
,
dataTypeClass
=
List
.
class
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"编号列表"
,
required
=
true
,
example
=
"1024,2048"
,
dataTypeClass
=
List
.
class
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:query')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:query')")
public
CommonResult
<
List
<
ScoreRuleBackVO
>>
getScoreRuleList
(
@NotNull
@RequestParam
Collection
<
Long
>
ids
)
{
public
CommonResult
<
List
<
ScoreRuleBackVO
>>
getScoreRuleList
(
@NotNull
@RequestParam
Collection
<
Long
>
ids
)
{
List
<
ScoreRuleBackVO
>
list
=
scoreRuleService
.
getScoreRuleList
(
ids
);
List
<
ScoreRuleBackVO
>
list
=
scoreRuleService
.
getScoreRuleList
(
ids
);
return
success
(
list
);
return
success
(
list
);
...
@@ -88,7 +88,7 @@ public class ScoreRuleController {
...
@@ -88,7 +88,7 @@ public class ScoreRuleController {
@PostMapping
(
"/page"
)
@PostMapping
(
"/page"
)
@ApiOperation
(
"获得积分规则分页"
)
@ApiOperation
(
"获得积分规则分页"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:query')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:query')")
public
CommonResult
<
PageResult
<
ScoreRuleBackVO
>>
getScoreRulePage
(
@Valid
@RequestBody
ScoreRuleQueryVO
query
,
PageVO
page
)
{
public
CommonResult
<
PageResult
<
ScoreRuleBackVO
>>
getScoreRulePage
(
@Valid
@RequestBody
ScoreRuleQueryVO
query
,
PageVO
page
)
{
PageResult
<
ScoreRuleBackVO
>
pageResult
=
scoreRuleService
.
getScoreRulePage
(
query
,
page
);
PageResult
<
ScoreRuleBackVO
>
pageResult
=
scoreRuleService
.
getScoreRulePage
(
query
,
page
);
return
success
(
pageResult
);
return
success
(
pageResult
);
...
@@ -96,7 +96,7 @@ public class ScoreRuleController {
...
@@ -96,7 +96,7 @@ public class ScoreRuleController {
@PostMapping
(
"/status"
)
@PostMapping
(
"/status"
)
@ApiOperation
(
"启用关闭"
)
@ApiOperation
(
"启用关闭"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:update')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
public
CommonResult
<
Boolean
>
updateStatus
(
@Valid
@RequestBody
ScoreRuleStatusReqVO
scoreRuleStatusReqVO
)
{
public
CommonResult
<
Boolean
>
updateStatus
(
@Valid
@RequestBody
ScoreRuleStatusReqVO
scoreRuleStatusReqVO
)
{
scoreRuleService
.
updateStatus
(
scoreRuleStatusReqVO
);
scoreRuleService
.
updateStatus
(
scoreRuleStatusReqVO
);
return
success
(
true
);
return
success
(
true
);
...
@@ -105,14 +105,14 @@ public class ScoreRuleController {
...
@@ -105,14 +105,14 @@ public class ScoreRuleController {
@PostMapping
(
"/copy"
)
@PostMapping
(
"/copy"
)
@ApiOperation
(
"复制规则"
)
@ApiOperation
(
"复制规则"
)
@Idempotent
(
timeout
=
3
)
@Idempotent
(
timeout
=
3
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:create')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:create')")
public
CommonResult
<
Long
>
copyScoreRule
(
@Valid
@RequestBody
IdReqVo
idReqVo
)
{
public
CommonResult
<
Long
>
copyScoreRule
(
@Valid
@RequestBody
IdReqVo
idReqVo
)
{
return
success
(
scoreRuleService
.
copyScoreRule
(
idReqVo
.
getId
()));
return
success
(
scoreRuleService
.
copyScoreRule
(
idReqVo
.
getId
()));
}
}
@PostMapping
(
"/delay"
)
@PostMapping
(
"/delay"
)
@ApiOperation
(
"延期规则"
)
@ApiOperation
(
"延期规则"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:update')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
public
CommonResult
<
Boolean
>
delayScoreRule
(
@Valid
@RequestBody
ScoreDelayReqVO
scoreDelayReqVO
)
{
public
CommonResult
<
Boolean
>
delayScoreRule
(
@Valid
@RequestBody
ScoreDelayReqVO
scoreDelayReqVO
)
{
scoreRuleService
.
delayScoreRule
(
scoreDelayReqVO
);
scoreRuleService
.
delayScoreRule
(
scoreDelayReqVO
);
return
success
(
true
);
return
success
(
true
);
...
@@ -135,7 +135,7 @@ public class ScoreRuleController {
...
@@ -135,7 +135,7 @@ public class ScoreRuleController {
@GetMapping
(
"/export-excel"
)
@GetMapping
(
"/export-excel"
)
@ApiOperation
(
"导出积分规则Excel"
)
@ApiOperation
(
"导出积分规则Excel"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:export')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:export')")
@OperateLog
(
type
=
EXPORT
)
@OperateLog
(
type
=
EXPORT
)
public
void
exportScoreRuleExcel
(
@Valid
ScoreRuleQueryVO
query
,
public
void
exportScoreRuleExcel
(
@Valid
ScoreRuleQueryVO
query
,
HttpServletResponse
response
)
throws
IOException
{
HttpServletResponse
response
)
throws
IOException
{
...
@@ -147,7 +147,7 @@ public class ScoreRuleController {
...
@@ -147,7 +147,7 @@ public class ScoreRuleController {
@PostMapping
(
"/switch/set"
)
@PostMapping
(
"/switch/set"
)
@ApiOperation
(
"设置会员工能开关"
)
@ApiOperation
(
"设置会员工能开关"
)
@PreAuthorize
(
"@ss.hasPermission('member:score-rule:update')"
)
//
@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
public
CommonResult
<
Boolean
>
setScoreRuleSwitch
(
@RequestBody
SwitchReqVo
switchReqVo
)
{
public
CommonResult
<
Boolean
>
setScoreRuleSwitch
(
@RequestBody
SwitchReqVo
switchReqVo
)
{
return
success
(
scoreRuleService
.
setScoreRuleSwitch
(
switchReqVo
));
return
success
(
scoreRuleService
.
setScoreRuleSwitch
(
switchReqVo
));
}
}
...
...
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/userScore/MemberUserScoreController.java
View file @
f50003d7
...
@@ -43,7 +43,7 @@ public class MemberUserScoreController {
...
@@ -43,7 +43,7 @@ public class MemberUserScoreController {
@PostMapping
(
"/page"
)
@PostMapping
(
"/page"
)
@ApiOperation
(
"获得会员积分分页"
)
@ApiOperation
(
"获得会员积分分页"
)
@PreAuthorize
(
"@ss.hasPermission('member:user-score:query')"
)
//
@PreAuthorize("@ss.hasPermission('member:user-score:query')")
public
CommonResult
<
PageResult
<
MemberUserScoreBackVO
>>
getUserScorePage
(
@Valid
@RequestBody
MemberUserScoreQueryVO
query
)
{
public
CommonResult
<
PageResult
<
MemberUserScoreBackVO
>>
getUserScorePage
(
@Valid
@RequestBody
MemberUserScoreQueryVO
query
)
{
PageResult
<
MemberUserScoreBackVO
>
pageResult
=
userScoreService
.
getUserScorePage
(
query
);
PageResult
<
MemberUserScoreBackVO
>
pageResult
=
userScoreService
.
getUserScorePage
(
query
);
return
success
(
pageResult
);
return
success
(
pageResult
);
...
@@ -52,7 +52,7 @@ public class MemberUserScoreController {
...
@@ -52,7 +52,7 @@ public class MemberUserScoreController {
@PostMapping
(
"/operate"
)
@PostMapping
(
"/operate"
)
@ApiOperation
(
"操作积分"
)
@ApiOperation
(
"操作积分"
)
@Idempotent
(
timeout
=
5
)
@Idempotent
(
timeout
=
5
)
@PreAuthorize
(
"@ss.hasPermission('member:user-score:operate')"
)
//
@PreAuthorize("@ss.hasPermission('member:user-score:operate')")
public
CommonResult
<
Boolean
>
operate
(
@Valid
@RequestBody
MemberUserScoreOperateQueryVO
query
)
{
public
CommonResult
<
Boolean
>
operate
(
@Valid
@RequestBody
MemberUserScoreOperateQueryVO
query
)
{
Map
<
String
,
Object
>
extParam
=
new
HashMap
<>();
Map
<
String
,
Object
>
extParam
=
new
HashMap
<>();
extParam
.
put
(
"comment"
,
query
.
getComment
());
extParam
.
put
(
"comment"
,
query
.
getComment
());
...
...
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/userScoreLog/MemberUserScoreLogController.java
View file @
f50003d7
...
@@ -29,7 +29,7 @@ public class MemberUserScoreLogController {
...
@@ -29,7 +29,7 @@ public class MemberUserScoreLogController {
@PostMapping
(
"/page"
)
@PostMapping
(
"/page"
)
@ApiOperation
(
"获得积分记录分页"
)
@ApiOperation
(
"获得积分记录分页"
)
@PreAuthorize
(
"@ss.hasPermission('member:user-score-log:query')"
)
//
@PreAuthorize("@ss.hasPermission('member:user-score-log:query')")
public
CommonResult
<
PageResult
<
MemberUserScoreLogBackVO
>>
page
(
@Valid
@RequestBody
MemberUserScoreLogQueryVO
query
)
{
public
CommonResult
<
PageResult
<
MemberUserScoreLogBackVO
>>
page
(
@Valid
@RequestBody
MemberUserScoreLogQueryVO
query
)
{
PageResult
<
MemberUserScoreLogBackVO
>
pageResult
=
memberUserScoreLogService
.
getPage
(
query
);
PageResult
<
MemberUserScoreLogBackVO
>
pageResult
=
memberUserScoreLogService
.
getPage
(
query
);
return
success
(
pageResult
);
return
success
(
pageResult
);
...
...
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