会员积分分页增加字段

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java

@@ -160,8 +160,8 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
             " uea.`name` as enterprise_name,",
             " uea.`create_time` as enterprise_audit_create_time,",
             " uea.`audit_time` as enterprise_audit_time," ,
-            " uea.`audit_remark` as enterprise_audit_remark",
-            " ifnull(mus.`hold_score`, 0) as hold_score",
+            " uea.`audit_remark` as enterprise_audit_remark,",
+            " ifnull( mus.`hold_score`, 0) as hold_score",
             "from member_user u ",
             "left join member_user_enterprise e on e.user_id = u.id and e.deleted = 0 ",
             "left join member_user_card_auth uca on u.id = uca.user_id and uca.deleted = 0 " ,

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

@@ -28,6 +28,8 @@ public class MemberUserScoreBackVO {
     private Integer holdScore;
     @ApiModelProperty(value = "已兑换积分")
     private Integer usedScore;
+    @ApiModelProperty(value = "已失效积分")
+    private Integer expiredScore;
     @ApiModelProperty(value = "会员注册时间")
     private Date createTime;
 }

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

@@ -10,8 +10,9 @@
         mu.mobile,
         re.title_zh as countryNameZh,
         re.title_en as countryNameEn,
-        mus.hold_score as holdScore,
-        mus.used_score as usedScore,
+        ifnull(mus.hold_score, 0) as holdScore,
+        ifnull(mus.used_score, 0) as usedScore,
+        ifnull(mus.expired_score, 0) as expiredScore,
         mu.create_time as createTime
         from member_user mu
         left join member_user_score mus on mus.member_id = mu.id