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
fcec6796
Commit
fcec6796
authored
Aug 21, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score
parents
b83a6f8f
4ab45806
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
3 deletions
+13
-3
MemberUserScoreMapper.xml
.../src/main/resources/mapper/user/MemberUserScoreMapper.xml
+9
-2
ErrorCodeConstants.java
...iocoder/yudao/module/reward/enums/ErrorCodeConstants.java
+1
-0
RewardRedeemServiceImpl.java
...module/reward/service/redeem/RewardRedeemServiceImpl.java
+1
-1
messages_en.properties
yudao-server/src/main/resources/i18n/messages_en.properties
+1
-0
messages_zh.properties
yudao-server/src/main/resources/i18n/messages_zh.properties
+1
-0
No files found.
yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreMapper.xml
View file @
fcec6796
...
...
@@ -61,9 +61,12 @@
<if
test=
"query.usedScoreOperate == 1"
>
and mus.used_score
>
#{query.usedScore}
</if>
<if
test=
"query.usedScoreOperate == 2"
>
<if
test=
"query.usedScoreOperate == 2
and query.usedScore != 0
"
>
and mus.used_score = #{query.usedScore}
</if>
<if
test=
"query.usedScoreOperate == 2 and query.usedScore == 0"
>
and (mus.used_score = 0 or mus.used_score is null)
</if>
<if
test=
"query.usedScoreOperate == 3"
>
and mus.used_score
<
#{query.usedScore}
</if>
...
...
@@ -73,9 +76,13 @@
<if
test=
"query.holdScoreOperate == 1"
>
and mus.hold_score
>
#{query.holdScore}
</if>
<if
test=
"query.holdScoreOperate == 2"
>
<if
test=
"query.holdScoreOperate == 2
and query.holdScore != 0
"
>
and mus.hold_score = #{query.holdScore}
</if>
<!--特殊条件处理-->
<if
test=
"query.holdScoreOperate == 2 and query.holdScore == 0"
>
and (mus.hold_score = 0 or mus.hold_score is null)
</if>
<if
test=
"query.holdScoreOperate == 3"
>
and mus.hold_score
<
#{query.holdScore}
</if>
...
...
yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java
View file @
fcec6796
...
...
@@ -30,5 +30,6 @@ public interface ErrorCodeConstants {
ErrorCode
REDEEM_CANCEL_STATUS_ERROR
=
new
ErrorCode
(
1001011024
,
"redeem.cancel.status.error"
);
ErrorCode
REWARD_NODE_AND_POINTS_LIST_ERROR
=
new
ErrorCode
(
1001011025
,
"reward.node.and.points.list.error"
);
ErrorCode
REWARD_REDEEM_RECIPIENT_ERROR
=
new
ErrorCode
(
1001011026
,
"reward.redeem.recipient.error"
);
ErrorCode
REDEEM_IMPORT_NO_RECORD
=
new
ErrorCode
(
1001011027
,
"redeem.import.no.record"
);
}
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java
View file @
fcec6796
...
...
@@ -228,7 +228,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
@Override
public
RecordInfoImportRespVO
recordImport
(
List
<
RedeemInfoImportExcelVO
>
dataList
)
{
if
(
CollectionUtils
.
isEmpty
(
dataList
))
{
return
RecordInfoImportRespVO
.
builder
().
redeemIdFailedMap
(
Collections
.
emptyMap
()).
build
(
);
throw
exception
(
ErrorCodeConstants
.
REDEEM_IMPORT_NO_RECORD
);
}
if
(
dataList
.
size
()
>
MAX_IMPORT_RECORD_COUNT
)
{
throw
exception
(
ErrorCodeConstants
.
REDEEM_IMPORT_MAX_COUNT
,
MAX_IMPORT_RECORD_COUNT
);
...
...
yudao-server/src/main/resources/i18n/messages_en.properties
View file @
fcec6796
...
...
@@ -1035,6 +1035,7 @@ reward.redeem.count.not.allow = bulk redemption is limited to a maximum of 10 pi
reward.redeem.allow.count.error
=
the number of redemptions allowed by the individual has been exceeded:{}
reward.node.and.points.list.error
=
reward node and points create error
reward.redeem.recipient.error
=
recipient info information is incomplete
redeem.import.no.record
=
no record in excel
redeem.import.max.count
=
allow maximum number of imports is {}
dict.unknown.error
=
Not in dict {0}: {1}
...
...
yudao-server/src/main/resources/i18n/messages_zh.properties
View file @
fcec6796
...
...
@@ -1030,6 +1030,7 @@ reward.redeem.count.not.allow = \u6279\u91CF\u5151\u6362\u6BCF\u6B21\u6700\u591A
reward.redeem.allow.count.error
=
\u
5DF2
\u
8D85
\u
51FA
\u
4E2A
\u
4EBA
\u5141\u
8BB8
\u5151\u6362\u
6B21
\u6570\u
FF1A{}
reward.node.and.points.list.error
=
\u
521B
\u
5EFA
\u
793C
\u
54C1
\u
7F51
\u
70B9
\u6216\u6240\u9700\u
79EF
\u5206\u9519\u
8BEF
reward.redeem.recipient.error
=
\u
793C
\u
54C1
\u6536\u
8D27
\u
4EBA
\u
4FE1
\u
606F
\u
4E0D
\u5168
redeem.import.no.record
=
\u8868\u
683C
\u
4E2D
\u
65E0
\u
8BB0
\u
5F55
get.lock.failed
=
\u
670D
\u
52A1
\u
7E41
\u
5FD9
\u
FF0C
\u
8BF7
\u
7A0D
\u
540E
\u
91CD
\u
8BD5
reward.redeem.not.exist
=
\u
793C
\u
54C1
\u5151\u6362\u
8BB0
\u
5F55
\u
4E0D
\u
5B58
\u5728
...
...
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