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
68e948dd
Commit
68e948dd
authored
Oct 10, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat-506,498: 兑换记录列表创建人修改,批量核销提示修改
parent
2efe88a1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
RewardRedeemServiceImpl.java
...module/reward/service/redeem/RewardRedeemServiceImpl.java
+12
-6
No files found.
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java
View file @
68e948dd
...
...
@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.ecw.api.express.dto.ExpressRespDTO;
import
cn.iocoder.yudao.module.member.api.score.MemberUserScoreApi
;
import
cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO
;
import
cn.iocoder.yudao.module.member.api.score.dto.ReleationScoreExpireInfoDTO
;
import
cn.iocoder.yudao.module.member.enums.PlatformTypeEnum
;
import
cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum
;
import
cn.iocoder.yudao.module.reward.controller.app.redeem.vo.AppRewardRedeemListRespVO
;
import
cn.iocoder.yudao.module.reward.dal.dataobject.redeem.RewardRedeemDO
;
...
...
@@ -80,6 +81,11 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
int
start
=
(
reqVO
.
getPageNo
()
-
1
)
*
reqVO
.
getPageSize
();
int
size
=
reqVO
.
getPageSize
();
List
<
RewardRedeemPageRespVO
>
result
=
rewardRedeemMapper
.
pageInfo
(
start
,
size
,
reqVO
);
result
.
forEach
(
respVO
->
{
if
(
respVO
.
getEntrance
()
!=
PlatformTypeEnum
.
BACKEND
.
getValue
())
{
respVO
.
setCreatorName
(
respVO
.
getMemberNameZh
());
}
});
int
total
=
rewardRedeemMapper
.
pageCount
(
reqVO
);
return
new
PageResult
<>(
result
,
total
,
reqVO
.
getPageSize
(),
reqVO
.
getPageNo
(),
(
total
+
reqVO
.
getPageSize
()
-
1
)
/
reqVO
.
getPageSize
());
}
...
...
@@ -159,7 +165,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
if
(
CollectionUtils
.
isEmpty
(
request
.
getIds
()))
{
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
}
List
<
Lo
ng
>
errorIds
=
checkBatchVerifyParam
(
request
);
List
<
Stri
ng
>
errorIds
=
checkBatchVerifyParam
(
request
);
if
(
CollectionUtils
.
isNotEmpty
(
errorIds
))
{
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_BATCH_VERIFY_ERROR
,
errorIds
);
}
...
...
@@ -407,13 +413,13 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
return
failedInfoMap
;
}
private
List
<
Lo
ng
>
checkBatchVerifyParam
(
RewardRedeemBatchVerifyReqVO
request
)
{
private
List
<
Stri
ng
>
checkBatchVerifyParam
(
RewardRedeemBatchVerifyReqVO
request
)
{
LambdaUpdateWrapper
<
RewardRedeemDO
>
wrapper
=
Wrappers
.
lambdaUpdate
();
wrapper
.
in
(
RewardRedeemDO:
:
getId
,
request
.
getIds
());
Map
<
Lo
ng
,
RewardRedeemDO
>
idRewardRedeemMap
=
this
.
list
(
wrapper
).
stream
()
.
collect
(
Collectors
.
toMap
(
RewardRedeemDO:
:
get
Id
,
Function
.
identity
(),
(
c1
,
c2
)
->
c1
));
return
idRewardRedeemMap
.
keySet
().
stream
().
filter
(
id
->
{
RewardRedeemDO
rewardRedeemDO
=
idRewardRedeemMap
.
get
(
id
);
Map
<
Stri
ng
,
RewardRedeemDO
>
idRewardRedeemMap
=
this
.
list
(
wrapper
).
stream
()
.
collect
(
Collectors
.
toMap
(
RewardRedeemDO:
:
get
RedemptionNumber
,
Function
.
identity
(),
(
c1
,
c2
)
->
c1
));
return
idRewardRedeemMap
.
keySet
().
stream
().
filter
(
coder
->
{
RewardRedeemDO
rewardRedeemDO
=
idRewardRedeemMap
.
get
(
coder
);
if
(
rewardRedeemDO
==
null
)
{
return
true
;
}
...
...
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