Merge remote-tracking branch 'origin/dev' into dev

yami-shop-service/src/main/resources/mapper/UserMapper.xml

@@ -136,6 +136,7 @@
         SUM(CASE WHEN points_type = 3 THEN points ELSE 0 END))  from tz_points_record 	where user_id =  a.user_id  and channel_id = a.channel_id),0) used -- 已消耗积分
         FROM tz_user a
         <where>
+            a.`status` = 1 and
             a.channel_id in (SELECT id FROM tz_channel)
             <if test="po.channelIdList != null and !po.channelIdList.isEmpty()">
                 and a.channel_id  in
@@ -228,6 +229,7 @@
                                        SUM(CASE WHEN points_type = 3 THEN points ELSE 0 END))  from tz_points_record 	where user_id =  a.user_id  and channel_id = a.channel_id),0) used -- 已消耗积分
         FROM tz_user a
         <where>
+            a.`status` = 1 and
             a.channel_id in (SELECT id FROM tz_channel)
             <if test="po.channelIdList != null and !po.channelIdList.isEmpty()">
                 and a.channel_id  in