新增会员英文名称

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/memberUserScore/MemberUserScoreBackVO.java

@@ -15,7 +15,9 @@ public class MemberUserScoreBackVO {
     @ApiModelProperty(value = "会员id")
     private String id;
     @ApiModelProperty(value = "会员昵称")
-    private String nickname;
+    private String memberNameZh;
+    @ApiModelProperty(value = "会员昵称英文")
+    private String memberNameEn;
     @ApiModelProperty(value = "联系方式")
     private String areaCode;
     @ApiModelProperty(value = "手机号")

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/memberUserScoreLog/MemberUserScoreLogBackVO.java

@@ -21,8 +21,10 @@ public class MemberUserScoreLogBackVO {
     private Long id;
     @ApiModelProperty(value = "会员id")
     private Long memberId;
-    @ApiModelProperty(value = "会员昵称")
-    private String memberName;
+    @ApiModelProperty(value = "会员昵称中文")
+    private String memberNameZh;
+    @ApiModelProperty(value = "会员昵称英文")
+    private String memberNameEn;
     @ApiModelProperty(value = "积分数量")
     private Integer scoreCount;
     @ApiModelProperty(value = "操作类别")

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreLogMapper.xml

@@ -7,7 +7,8 @@
         select
         musl.id as id,
         musl.member_id as memberId,
-        mu.nickname as memberName,
+        mu.nickname as memberNameZh,
+        mu.english_name as memberNameEn,
         musl.score_count as scoreCount,
         musl.operate_type as operateType,
         musl.source_type as sourceType,

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreMapper.xml

@@ -5,7 +5,8 @@
             resultType="cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreBackVO">
         select
         mu.id,
-        mu.nickname,
+        mu.nickname as memberNameZh,
+        mu.english_name as memberNameEn,
         mu.area_code as areaCode,
         mu.mobile,
         re.title_zh as countryNameZh,

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java

@@ -2,16 +2,10 @@ package cn.iocoder.yudao.module.reward.service.redeem;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
-import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
-import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.reward.dal.dataobject.redeem.RewardRedeemDO;
 import cn.iocoder.yudao.module.reward.dal.mysql.redeem.RewardRedeemMapper;
 import cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageReqVO;
 import cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageRespVO;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;