Merge branch 'feature_member_score' into dev

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/listener/RewardRedeemRecordExportListener.java

@@ -90,7 +90,7 @@ public class RewardRedeemRecordExportListener {
             exportVO.setStatus(item.getStatus());
             exportVO.setRewardCode(item.getRewardCode());
             exportVO.setRewardTitle(item.getRewardTitleZh());
-            exportVO.setMemberName(item.getMemberName());
+            exportVO.setMemberName(item.getMemberNameZh());
             exportVO.setRewardCount(item.getRewardCount());
             exportVO.setRedeemType(item.getRedeemType());
             exportVO.setEntrance(item.getEntrance());

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java

@@ -7,8 +7,10 @@ import lombok.Data;
 @Data
 @ApiModel("管理后台 - 礼品兑换记录分页结果 VO")
 public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
-    @ApiModelProperty(value = "会员信息")
-    private String memberName;
+    @ApiModelProperty(value = "会员名称中文")
+    private String memberNameZh;
+    @ApiModelProperty(value = "会员名称英文")
+    private String memberNameEn;
     @ApiModelProperty(value = "礼品ID")
     private String rewardCode;
     @ApiModelProperty(value = "礼品名称（中文）")

yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml

@@ -95,7 +95,8 @@
         err.deleted as deleted,
         err.verify_user as verifyUser,
         err.verify_time as verifyTime,
-        mu.nickname as memberName,
+        mu.nickname as memberNameZh,
+        mu.english_name as memberNameEn,
         er.code as rewardCode,
         er.title_zh as rewardTitleZh,
         er.title_en as rewardTitleEn,