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
423791de
Commit
423791de
authored
Sep 19, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat-481: 兑换记录列表,添加会员编号查询条件
parent
7c07242b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
RewardRedeemPageReqVO.java
.../yudao/module/reward/vo/reward/RewardRedeemPageReqVO.java
+2
-0
RewardRedeemPageRespVO.java
...yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java
+2
-0
RewardRedeemMapper.xml
...ard-impl/src/main/resources/mapper/RewardRedeemMapper.xml
+4
-0
No files found.
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageReqVO.java
View file @
423791de
...
@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam {
...
@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam {
private
String
rewardTitle
;
private
String
rewardTitle
;
@ApiModelProperty
(
value
=
"会员名称"
)
@ApiModelProperty
(
value
=
"会员名称"
)
private
String
memberName
;
private
String
memberName
;
@ApiModelProperty
(
value
=
"会员编号"
)
private
String
memberCode
;
@ApiModelProperty
(
value
=
"领取方式"
)
@ApiModelProperty
(
value
=
"领取方式"
)
private
Integer
redeemType
;
private
Integer
redeemType
;
@ApiModelProperty
(
value
=
"状态"
)
@ApiModelProperty
(
value
=
"状态"
)
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java
View file @
423791de
...
@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
...
@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
private
String
memberNameZh
;
private
String
memberNameZh
;
@ApiModelProperty
(
value
=
"会员名称英文"
)
@ApiModelProperty
(
value
=
"会员名称英文"
)
private
String
memberNameEn
;
private
String
memberNameEn
;
@ApiModelProperty
(
value
=
"会员编号"
)
private
String
memberCode
;
@ApiModelProperty
(
value
=
"礼品ID"
)
@ApiModelProperty
(
value
=
"礼品ID"
)
private
String
rewardCode
;
private
String
rewardCode
;
@ApiModelProperty
(
value
=
"礼品名称(中文)"
)
@ApiModelProperty
(
value
=
"礼品名称(中文)"
)
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml
View file @
423791de
...
@@ -109,6 +109,7 @@
...
@@ -109,6 +109,7 @@
err.verify_time as verifyTime,
err.verify_time as verifyTime,
mu.nickname as memberNameZh,
mu.nickname as memberNameZh,
mu.english_name as memberNameEn,
mu.english_name as memberNameEn,
mu.code as memberCode,
er.code as rewardCode,
er.code as rewardCode,
er.title_zh as rewardTitleZh,
er.title_zh as rewardTitleZh,
er.title_en as rewardTitleEn,
er.title_en as rewardTitleEn,
...
@@ -130,6 +131,9 @@
...
@@ -130,6 +131,9 @@
<if
test=
"req.memberName != null and req.memberName !=''"
>
<if
test=
"req.memberName != null and req.memberName !=''"
>
and mu.nickname like '%${req.memberName}%'
and mu.nickname like '%${req.memberName}%'
</if>
</if>
<if
test=
"req.memberCode != null and req.memberCode !=''"
>
and mu.code = #{req.memberCode}
</if>
<if
test=
"req.rewardCode != null and req.rewardCode !=''"
>
<if
test=
"req.rewardCode != null and req.rewardCode !=''"
>
and er.code like '%${req.rewardCode}%'
and er.code like '%${req.rewardCode}%'
</if>
</if>
...
...
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