修改了部分注释,百城千团team表增加活动类型字段

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mq/RabbitKxsOrderQueueListener.java

@@ -40,6 +40,7 @@ public class RabbitKxsOrderQueueListener {
 	@RabbitListener(queues = RabbitKxsOrderQueueMQ.QUEUE_NAME, ackMode = "MANUAL")
 	@RabbitHandler
 	public void onMessage(String msg, Message message, Channel channel){
+		log.info("收到客小爽订单消息: " + msg);
 		log.info("收到客小爽订单消息: " + RabbitKxsOrderQueueMQ.parse(msg));
         try {
 			RabbitKxsOrderQueueMQ.MsgEntity parse = RabbitKxsOrderQueueMQ.parse(msg);

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteUserService.java

@@ -36,12 +36,12 @@ public interface RemoteUserService {
 	/**
 	 * 定时统计活动期间人员激活  定时任务
 	 */
-	@PostExchange("/setUserActivityTimeStat")
+	@PostExchange("/camp/setUserActivityTimeStat")
 	void setUserActivityTimeStat(@RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
 	 * 定时任务,关闭活动结束的team和用户状态
 	 */
-	@PostExchange("/setUserActiviteStatus")
+	@PostExchange("/camp/setUserActiviteStatus")
 	void setUserActiviteStatus(@RequestHeader(SecurityConstants.FROM) String from);
 }

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsBcqtTeam.java

@@ -127,7 +127,11 @@ public class KxsBcqtTeam extends Model<KxsBcqtTeam> implements Serializable {
      */
     @Schema(description = "队长名")
     private String username;
-
+    /**
+     * 活动类型 1训练营
+     */
+    @Schema(description = "活动类型 1训练营")
+    private Integer activiteType;
 
 }
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/GetByBcqtPageVO.java

@@ -102,5 +102,9 @@ public class GetByBcqtPageVO {
      */
     @Schema(description = "激活总量")
     private Integer activityTotal;
-
+    /**
+     * 活动类型 1训练营
+     */
+    @Schema(description = "活动类型 1训练营")
+    private Integer activiteType;
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsBcqtTeamServiceImpl.java

@@ -277,7 +277,7 @@ public class KxsBcqtTeamServiceImpl extends ServiceImpl<KxsBcqtTeamMapper, KxsBc
     public void setUserActivityTimeStat() {
         //获取全部活动中团队
         List<KxsBcqtTeam> list = list(Wrappers.<KxsBcqtTeam>query().lambda().eq(KxsBcqtTeam::getStatus, 1));
-        //构造查询数据
+        //处理查询数据
         for (KxsBcqtTeam kxsBcqtTeam : list) {
             ArrayList<GetActivityStatByIdAndTimeDTO> getActivityStatByIdAndTimeDTOS = new ArrayList<>();
             //构造该团队的查询日期
@@ -290,10 +290,10 @@ public class KxsBcqtTeamServiceImpl extends ServiceImpl<KxsBcqtTeamMapper, KxsBc
                 String currentDateString = LocalDateTimeUtil.format(currentDate, DatePattern.PURE_DATE_PATTERN);
                 futureDates.add(currentDateString);
             }
-            //查询所有团队成员
+            //查询团队所有成员
             List<KxsBcqtTeamDetail> kxsBcqtTeamDetailS = kxsBcqtTeamDetailMapper.selectList(Wrappers.<KxsBcqtTeamDetail>query().lambda()
                     .eq(KxsBcqtTeamDetail::getTeamId,kxsBcqtTeam.getId()));
-            //构造dto
+            //构造查询dto
             for (KxsBcqtTeamDetail kxsBcqtTeamDetail : kxsBcqtTeamDetailS) {
                 GetActivityStatByIdAndTimeDTO getActivityStatByIdAndTimeDTO = new GetActivityStatByIdAndTimeDTO();
                 getActivityStatByIdAndTimeDTO.setUserId(kxsBcqtTeamDetail.getUserId());
@@ -455,7 +455,6 @@ public class KxsBcqtTeamServiceImpl extends ServiceImpl<KxsBcqtTeamMapper, KxsBc
         }
         if (kxsBcqtTeam.getStatus() != 0){
             return R.failed("只能加入未开始的团队");
-
         }
         R<KxsUser> kxsUserR = remoteKxsUserService.loadUserById(Math.toIntExact(userId),SecurityConstants.FROM_IN);
         KxsUser kxsUser = kxsUserR.getData();