Merge branch 'dev_1_3_2_20220815' of http://git.dayaedu.com/yonge/cooleshow into dev_1_3_2_20220815

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/CacheNameEnum.java

@@ -17,9 +17,9 @@ public enum CacheNameEnum implements BaseEnum<String, CacheNameEnum> {
 
     TEACHER_TOTAL("老师统计缓存"),
     STUDENT_TOTAL("学生统计缓存"),
-    SUBJECT_ITEM("声部下拉缓存", Duration.ofHours(1L)),
-    TEACHER_SUBJECT_ITEM("老师声部下拉缓存", Duration.ofHours(1L)),
-    STUDENT_SUBJECT_ITEM("学生声部下拉缓存", Duration.ofHours(1L)),
+    SUBJECT_ITEM("声部下拉缓存", Duration.ofMinutes(1L)),
+    TEACHER_SUBJECT_ITEM("老师声部下拉缓存", Duration.ofMinutes(1L)),
+    STUDENT_SUBJECT_ITEM("学生声部下拉缓存", Duration.ofMinutes(1L)),
 
     LOCK_EXECUTE_ORDER("用户下单/付款/取消订单锁"),
     LOCK_RECORD_ACCOUNT("账户记录锁"),

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -79,7 +79,6 @@ public class ActivityRewardController extends BaseController {
     @ApiOperation(value = "查询列表", notes = "传入activityRewardSearch")
     @PreAuthorize("@pcs.hasPermissions('activityReward/list')")
     public HttpResponseResult<List<ActivityRewardVo>> list(@RequestBody ActivityRewardSearch query) {
-        query.setHasStock(YesOrNoEnum.YES);
         List<ActivityRewardVo> list = activityRewardService.selectAll(query);
         return succeed(list);
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRewardSearch.java

@@ -24,7 +24,7 @@ public class ActivityRewardSearch extends QueryInfo{
 	private String rewardClient;
 
 	@ApiModelProperty("是否只查询有库存的数据 0 否 1 是")
-	private YesOrNoEnum hasStock = YesOrNoEnum.NO;
+	private YesOrNoEnum hasStock;
 
 	public String getRewardName() {
 		return rewardName;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -122,7 +122,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         RMap<String, List<Subject>> map = redissonClient.getMap(CacheNameEnum.STUDENT_SUBJECT_ITEM.getRedisKey(userId));
         //设置过期时间
         map.expire(CacheNameEnum.STUDENT_SUBJECT_ITEM.getDuration().toHours(),
-                TimeUnit.HOURS);
+                TimeUnit.MINUTES);
 
         if (StringUtil.isEmpty(type)) {
             List<Subject> subjectList = map.get("ALL");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -139,7 +139,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         }
 
         redissonClient.getBucket(CacheNameEnum.SUBJECT_ITEM.getRedisKey(type)).set(parents,
-                CacheNameEnum.STUDENT_SUBJECT_ITEM.getDuration().toHours(),TimeUnit.HOURS);
+                CacheNameEnum.STUDENT_SUBJECT_ITEM.getDuration().toHours(),TimeUnit.MINUTES);
         return parents;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -458,7 +458,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         RMap<String, List<Subject>> map = redissonClient.getMap(CacheNameEnum.TEACHER_SUBJECT_ITEM.getRedisKey(userId));
         //设置过期时间
         map.expire(CacheNameEnum.TEACHER_SUBJECT_ITEM.getDuration().toHours(),
-                TimeUnit.HOURS);
+                TimeUnit.MINUTES);
 
         if (StringUtil.isEmpty(type)) {
             List<Subject> subjectList = map.get("ALL");

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_