Merge branch 'dev_1_3_2_20220815'

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanRewardMapper.xml

@@ -82,8 +82,6 @@
 
 
 	<update id="reduceStock">
-
         update activity_plan_reward set reward_num_ = reward_num_ - 1 where #{activityId} = activity_id_ and #{rewardId} = reward_id_ and reward_num_ > 0
-
     </update>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRegistrationMapper.xml

@@ -94,5 +94,6 @@
                 and a.num > 0
             </if>
         </where>
+        order by t.create_time_ desc
 	</select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardChangeStockMapper.xml

@@ -55,5 +55,6 @@
                 and t.create_time_ <= #{param.endTime}
             </if>
         </where>
+        order by t.create_time_ desc
     </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityUserRewardMapper.xml

@@ -35,12 +35,12 @@
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserRewardVo">
         SELECT
-        su.id_ as userId,
-        su.real_name_ as realName,
-        su.username_ as username,
-        su.phone_ as phone,
-        t.create_time_ as createTime,
-        group_concat(if(t.grant_flag_ = 1,ar.reward_name_,null)) as rewardNames
+            su.id_ as userId,
+            su.real_name_ as realName,
+            su.username_ as username,
+            su.phone_ as phone,
+            t.create_time_ as createTime,
+            group_concat(if(t.grant_flag_ = 1,ar.reward_name_,null)) as rewardNames
         FROM activity_user_reward t
         left join activity_reward ar on ar.id_ = t.reward_id_
         left join sys_user su on t.user_id_ = su.id_