Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_2022-11-22

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampServiceImpl.java

@@ -180,7 +180,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
                 .ge(Objects.nonNull(param.get("applyStartDate")), TempLittleArtistTrainingCamp::getApplyStartDate, param.get("applyStartDate"))
                 .le(Objects.nonNull(param.get("applyEndDate")), TempLittleArtistTrainingCamp::getApplyEndDate, param.get("applyEndDate"))
                 .ge(Objects.nonNull(param.get("trainStartDate")), TempLittleArtistTrainingCamp::getTrainStartDate, param.get("trainStartDate"))
-                .le(Objects.nonNull(param.get("trainEndDate")), TempLittleArtistTrainingCamp::getTrainEndDate, param.get("trainEndDate")));
+                .le(Objects.nonNull(param.get("trainEndDate")), TempLittleArtistTrainingCamp::getTrainEndDate, param.get("trainEndDate"))
+                .orderByDesc(TempLittleArtistTrainingCamp::getId));
         return PageUtil.pageInfo(pageList);
     }
 
@@ -310,7 +311,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         SysUser user = getUser();
         //查询未删除的训练营
         List<TempLittleArtistTrainingCamp> campList = this.list(Wrappers.<TempLittleArtistTrainingCamp>lambdaQuery()
-                .eq(TempLittleArtistTrainingCamp::getDelFlag, 0));
+                .eq(TempLittleArtistTrainingCamp::getDelFlag, 0)
+                .orderByDesc(TempLittleArtistTrainingCamp::getId));
         //查询该学员是否购买过该训练营
         TempLittleArtistTrainingCampUserRelation userRelation = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
@@ -323,7 +325,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
                                 .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, a.getId()));
                         a.setUserCount(count);
                     })
-                    .sorted(Comparator.comparing(TempLittleArtistTrainingCamp::getApplyStartDate))
+//                    .sorted(Comparator.comparing(TempLittleArtistTrainingCamp::getApplyStartDate))
                     .collect(Collectors.toList());
         }
         result.put("campList", campList);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampUserRelationServiceImpl.java

@@ -67,7 +67,7 @@ public class TempLittleArtistTrainingCampUserRelationServiceImpl extends Service
         TempLittleArtistTrainingCampUserRelation one = this.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId())
                 .isNotNull(TempLittleArtistTrainingCampUserRelation::getActivityId));
-        if (Objects.nonNull(one)) {
+        if (Objects.nonNull(one) && one.getActivityId() != null) {
             throw new BizException("您已登记训练营!");
         }
         int count = this.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
@@ -81,11 +81,22 @@ public class TempLittleArtistTrainingCampUserRelationServiceImpl extends Service
         if (updateFlag == 0) {
             throw new BizException("人数已报满！");
         }
-        this.update(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
-                .set(TempLittleArtistTrainingCampUserRelation::getActivityId, campId)
-                .set(TempLittleArtistTrainingCampUserRelation::getState, TempLittleArtistTrainingCampUserRelation.APPLY)
-                .set(TempLittleArtistTrainingCampUserRelation::getApplyTime, new Date())
-                .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
+        Date now = new Date();
+        if(Objects.isNull(one)){
+            one = new TempLittleArtistTrainingCampUserRelation();
+            one.setCreateTime(new Date());
+            one.setUserId(user.getId());
+            one.setActivityId(campId);
+            one.setApplyTime(now);
+            one.setState(TempLittleArtistTrainingCampUserRelation.APPLY);
+            this.save(one);
+        }else {
+            this.update(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
+                    .set(TempLittleArtistTrainingCampUserRelation::getActivityId, campId)
+                    .set(TempLittleArtistTrainingCampUserRelation::getState, TempLittleArtistTrainingCampUserRelation.APPLY)
+                    .set(TempLittleArtistTrainingCampUserRelation::getApplyTime,now)
+                    .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
+        }
         addCamp.delete();
     }
 

mec-biz/src/main/resources/config/mybatis/TempLittleArtistTrainingCampUserRelationMapper.xml

@@ -12,8 +12,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id_
-        , activity_id_, user_id_, im_group_id_, state_, create_time_,apply_time_
+        id_, activity_id_, user_id_, im_group_id_, state_, create_time_,apply_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"