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
8331dfda
Commit
8331dfda
authored
Aug 01, 2024
by
zhaobiyan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兑换列表增加会员名称英文
parent
fffe49e0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
RewardRedeemRecordExportListener.java
...ule/reward/listener/RewardRedeemRecordExportListener.java
+1
-1
RewardRedeemPageRespVO.java
...yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java
+4
-2
RewardRedeemMapper.xml
...ard-impl/src/main/resources/mapper/RewardRedeemMapper.xml
+2
-1
No files found.
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/listener/RewardRedeemRecordExportListener.java
View file @
8331dfda
...
@@ -90,7 +90,7 @@ public class RewardRedeemRecordExportListener {
...
@@ -90,7 +90,7 @@ public class RewardRedeemRecordExportListener {
exportVO
.
setStatus
(
item
.
getStatus
());
exportVO
.
setStatus
(
item
.
getStatus
());
exportVO
.
setRewardCode
(
item
.
getRewardCode
());
exportVO
.
setRewardCode
(
item
.
getRewardCode
());
exportVO
.
setRewardTitle
(
item
.
getRewardTitleZh
());
exportVO
.
setRewardTitle
(
item
.
getRewardTitleZh
());
exportVO
.
setMemberName
(
item
.
getMemberName
());
exportVO
.
setMemberName
(
item
.
getMemberName
Zh
());
exportVO
.
setRewardCount
(
item
.
getRewardCount
());
exportVO
.
setRewardCount
(
item
.
getRewardCount
());
exportVO
.
setRedeemType
(
item
.
getRedeemType
());
exportVO
.
setRedeemType
(
item
.
getRedeemType
());
exportVO
.
setEntrance
(
item
.
getEntrance
());
exportVO
.
setEntrance
(
item
.
getEntrance
());
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java
View file @
8331dfda
...
@@ -7,8 +7,10 @@ import lombok.Data;
...
@@ -7,8 +7,10 @@ import lombok.Data;
@Data
@Data
@ApiModel
(
"管理后台 - 礼品兑换记录分页结果 VO"
)
@ApiModel
(
"管理后台 - 礼品兑换记录分页结果 VO"
)
public
class
RewardRedeemPageRespVO
extends
RewardRedeemBaseVO
{
public
class
RewardRedeemPageRespVO
extends
RewardRedeemBaseVO
{
@ApiModelProperty
(
value
=
"会员信息"
)
@ApiModelProperty
(
value
=
"会员名称中文"
)
private
String
memberName
;
private
String
memberNameZh
;
@ApiModelProperty
(
value
=
"会员名称英文"
)
private
String
memberNameEn
;
@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 @
8331dfda
...
@@ -95,7 +95,8 @@
...
@@ -95,7 +95,8 @@
err.deleted as deleted,
err.deleted as deleted,
err.verify_user as verifyUser,
err.verify_user as verifyUser,
err.verify_time as verifyTime,
err.verify_time as verifyTime,
mu.nickname as memberName,
mu.nickname as memberNameZh,
mu.english_name as memberNameEn,
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,
...
...
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