会员积分列表新增城市字段

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

@@ -17,6 +17,8 @@ public class MemberUserScoreQueryVO extends PageParam {
     private String key;
     @ApiModelProperty(value = "国家")
     private Integer country;
+    @ApiModelProperty(value = "城市")
+    private Integer city;
     @ApiModelProperty(value = "当前积分")
     private Integer holdScore;
     @ApiModelProperty(value = "当前积分操作")

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

@@ -13,10 +13,13 @@
         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
+        mu.create_time as createTime,
+        rea.title_zh as cityNameZh,
+        rea.title_en as cityNameEn,
         from member_user mu
         left join member_user_score mus on mus.member_id = mu.id
         left join ecw_region re on re.id = mu.country
+        left join ecw_region rea on re.id = mu.city
         where 1 = 1
         <include refid="scoreCondition"/>
         order by mu.id
@@ -43,6 +46,9 @@
         <if test="query.country != null">
             and mu.country = #{query.country}
         </if>
+        <if test="query.city != null">
+            and mu.city = #{query.city}
+        </if>
         <if test="query.startTime != null ">
             and mu.create_time &gt;= #{query.startTime}
         </if>