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
87f219e9
Commit
87f219e9
authored
Aug 02, 2024
by
zhaobiyan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_member_score_zby' into feature_member_score
parents
fb550f73
953d970a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
44 deletions
+44
-44
RedeemRewardController.java
...eward/controller/admin/redeem/RedeemRewardController.java
+4
-4
RewardRedeemService.java
...dao/module/reward/service/redeem/RewardRedeemService.java
+2
-2
RewardRedeemServiceImpl.java
...module/reward/service/redeem/RewardRedeemServiceImpl.java
+30
-38
RewardRedeemIdReqVO.java
...er/yudao/module/reward/vo/reward/RewardRedeemIdReqVO.java
+8
-0
No files found.
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/redeem/RedeemRewardController.java
View file @
87f219e9
...
@@ -86,14 +86,14 @@ public class RedeemRewardController {
...
@@ -86,14 +86,14 @@ public class RedeemRewardController {
@PostMapping
(
"record/cancel/check"
)
@PostMapping
(
"record/cancel/check"
)
@ApiOperation
(
"撤销检查"
)
@ApiOperation
(
"撤销检查"
)
public
CommonResult
<
RedeemCancelCheckRespVO
>
cancelCheck
(
@Valid
@RequestBody
List
<
Long
>
ids
)
{
public
CommonResult
<
RedeemCancelCheckRespVO
>
cancelCheck
(
@Valid
@RequestBody
RewardRedeemIdReqVO
req
)
{
return
success
(
rewardRedeemService
.
cancelCheck
(
ids
));
return
success
(
rewardRedeemService
.
cancelCheck
(
req
));
}
}
@PostMapping
(
"record/cancel"
)
@PostMapping
(
"record/cancel"
)
@ApiOperation
(
"撤销"
)
@ApiOperation
(
"撤销"
)
public
CommonResult
<
Boolean
>
cancel
(
@Valid
@RequestBody
List
<
Long
>
ids
)
{
public
CommonResult
<
Boolean
>
cancel
(
@Valid
@RequestBody
RewardRedeemIdReqVO
req
)
{
return
success
(
rewardRedeemService
.
cancel
(
ids
));
return
success
(
rewardRedeemService
.
cancel
(
req
));
}
}
@PostMapping
(
"record/import/template"
)
@PostMapping
(
"record/import/template"
)
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemService.java
View file @
87f219e9
...
@@ -34,7 +34,7 @@ public interface RewardRedeemService extends IService<RewardRedeemDO> {
...
@@ -34,7 +34,7 @@ public interface RewardRedeemService extends IService<RewardRedeemDO> {
RecordInfoImportRespVO
recordImport
(
List
<
RedeemInfoImportExcelVO
>
dataList
);
RecordInfoImportRespVO
recordImport
(
List
<
RedeemInfoImportExcelVO
>
dataList
);
Boolean
cancel
(
List
<
Long
>
ids
);
Boolean
cancel
(
RewardRedeemIdReqVO
req
);
RedeemCancelCheckRespVO
cancelCheck
(
List
<
Long
>
ids
);
RedeemCancelCheckRespVO
cancelCheck
(
RewardRedeemIdReqVO
req
);
}
}
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java
View file @
87f219e9
...
@@ -245,16 +245,12 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
...
@@ -245,16 +245,12 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
}
}
@Override
@Override
public
Boolean
cancel
(
List
<
Long
>
ids
)
{
public
Boolean
cancel
(
RewardRedeemIdReqVO
req
)
{
if
(
CollectionUtils
.
isEmpty
(
ids
))
{
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
}
ids
.
forEach
(
id
->
{
//取消兑换 状态改为已取消 回退扣减的积分 ,如果存在已过期的积分,则直接过期
//取消兑换 状态改为已取消 回退扣减的积分 ,如果存在已过期的积分,则直接过期
if
(
id
==
null
)
{
if
(
req
.
getId
()
==
null
)
{
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
}
}
RewardRedeemDO
rewardRedeemDO
=
this
.
getById
(
id
);
RewardRedeemDO
rewardRedeemDO
=
this
.
getById
(
req
.
getId
()
);
if
(
rewardRedeemDO
==
null
)
{
if
(
rewardRedeemDO
==
null
)
{
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
}
}
...
@@ -262,7 +258,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
...
@@ -262,7 +258,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
throw
exception
(
ErrorCodeConstants
.
REDEEM_CANCEL_STATUS_ERROR
);
throw
exception
(
ErrorCodeConstants
.
REDEEM_CANCEL_STATUS_ERROR
);
}
}
LambdaUpdateWrapper
<
RewardRedeemDO
>
updateWrapper
=
Wrappers
.
lambdaUpdate
();
LambdaUpdateWrapper
<
RewardRedeemDO
>
updateWrapper
=
Wrappers
.
lambdaUpdate
();
updateWrapper
.
eq
(
RewardRedeemDO:
:
getId
,
id
);
updateWrapper
.
eq
(
RewardRedeemDO:
:
getId
,
req
.
getId
()
);
updateWrapper
.
eq
(
RewardRedeemDO:
:
getStatus
,
RewardRedeemStatusEnum
.
REDEEMING
.
getValue
());
updateWrapper
.
eq
(
RewardRedeemDO:
:
getStatus
,
RewardRedeemStatusEnum
.
REDEEMING
.
getValue
());
updateWrapper
.
set
(
RewardRedeemDO:
:
getStatus
,
RewardRedeemStatusEnum
.
CANCELED
.
getValue
());
updateWrapper
.
set
(
RewardRedeemDO:
:
getStatus
,
RewardRedeemStatusEnum
.
CANCELED
.
getValue
());
boolean
updateSuccess
=
this
.
update
(
null
,
updateWrapper
);
boolean
updateSuccess
=
this
.
update
(
null
,
updateWrapper
);
...
@@ -270,24 +266,20 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
...
@@ -270,24 +266,20 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
throw
exception
(
ErrorCodeConstants
.
REDEEM_CANCEL_STATUS_ERROR
);
throw
exception
(
ErrorCodeConstants
.
REDEEM_CANCEL_STATUS_ERROR
);
}
}
Map
<
String
,
Object
>
extParam
=
new
HashMap
<>();
Map
<
String
,
Object
>
extParam
=
new
HashMap
<>();
extParam
.
put
(
"redeemId"
,
id
);
extParam
.
put
(
"redeemId"
,
req
.
getId
()
);
memberUserScoreApi
.
operateScore
(
MemberUserScoreOperateReqDTO
.
builder
()
memberUserScoreApi
.
operateScore
(
MemberUserScoreOperateReqDTO
.
builder
()
.
memberId
(
rewardRedeemDO
.
getMemberId
())
.
memberId
(
rewardRedeemDO
.
getMemberId
())
.
sourceType
(
ScoreSourceTypeEnum
.
EXCHANGE_REWARD_CANCEL
)
.
sourceType
(
ScoreSourceTypeEnum
.
EXCHANGE_REWARD_CANCEL
)
.
scoreCount
(
rewardRedeemDO
.
getScoreCount
())
.
scoreCount
(
rewardRedeemDO
.
getScoreCount
())
.
extParam
(
extParam
)
.
extParam
(
extParam
)
.
releationId
(
String
.
valueOf
(
id
))
.
releationId
(
String
.
valueOf
(
req
.
getId
()
))
.
build
());
.
build
());
});
return
true
;
return
true
;
}
}
@Override
@Override
public
RedeemCancelCheckRespVO
cancelCheck
(
List
<
Long
>
ids
)
{
public
RedeemCancelCheckRespVO
cancelCheck
(
RewardRedeemIdReqVO
req
)
{
if
(
CollectionUtils
.
isEmpty
(
ids
))
{
RewardRedeemDO
rewardRedeemDO
=
this
.
getById
(
req
.
getId
());
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
}
RewardRedeemDO
rewardRedeemDO
=
this
.
getById
(
ids
.
get
(
0
));
if
(
rewardRedeemDO
==
null
)
{
if
(
rewardRedeemDO
==
null
)
{
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
throw
exception
(
ErrorCodeConstants
.
REWARD_REDEEM_NOT_EXIST
);
}
}
...
@@ -295,7 +287,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
...
@@ -295,7 +287,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
throw
exception
(
ErrorCodeConstants
.
REDEEM_CANCEL_STATUS_ERROR
);
throw
exception
(
ErrorCodeConstants
.
REDEEM_CANCEL_STATUS_ERROR
);
}
}
List
<
ReleationScoreExpireInfoDTO
>
scoreExpireInfo
=
memberUserScoreApi
List
<
ReleationScoreExpireInfoDTO
>
scoreExpireInfo
=
memberUserScoreApi
.
getScoreExpireInfo
(
String
.
valueOf
(
ids
.
get
(
0
)),
ScoreSourceTypeEnum
.
EXCHANGE_REWARD
);
.
getScoreExpireInfo
(
String
.
valueOf
(
req
.
getId
(
)),
ScoreSourceTypeEnum
.
EXCHANGE_REWARD
);
int
totalExpireScore
=
scoreExpireInfo
.
stream
().
filter
(
e
->
e
.
getExpireDate
()
!=
null
&&
e
.
getExpireDate
().
compareTo
(
new
Date
())
<
0
)
int
totalExpireScore
=
scoreExpireInfo
.
stream
().
filter
(
e
->
e
.
getExpireDate
()
!=
null
&&
e
.
getExpireDate
().
compareTo
(
new
Date
())
<
0
)
.
mapToInt
(
ReleationScoreExpireInfoDTO:
:
getScoreCount
).
sum
();
.
mapToInt
(
ReleationScoreExpireInfoDTO:
:
getScoreCount
).
sum
();
return
RedeemCancelCheckRespVO
.
builder
().
expireCount
(
totalExpireScore
).
build
();
return
RedeemCancelCheckRespVO
.
builder
().
expireCount
(
totalExpireScore
).
build
();
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemIdReqVO.java
0 → 100644
View file @
87f219e9
package
cn
.
iocoder
.
yudao
.
module
.
reward
.
vo
.
reward
;
import
lombok.Data
;
@Data
public
class
RewardRedeemIdReqVO
{
private
Long
id
;
}
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