Commit 8331dfda authored by zhaobiyan's avatar zhaobiyan

兑换列表增加会员名称英文

parent fffe49e0
...@@ -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.getMemberNameZh());
exportVO.setRewardCount(item.getRewardCount()); exportVO.setRewardCount(item.getRewardCount());
exportVO.setRedeemType(item.getRedeemType()); exportVO.setRedeemType(item.getRedeemType());
exportVO.setEntrance(item.getEntrance()); exportVO.setEntrance(item.getEntrance());
......
...@@ -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 = "礼品名称(中文)")
......
...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment