Merge branch 'dev_1_3_4_20220825' into online

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

@@ -195,8 +195,8 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
                 query.activityType(ActivityTypeEnum.SHARE.getCode())
                         .resourceType(ActivityResourceEnum.TEACHER.getCode())
                         .activityState(EStatus.ENABLE.getValue())
-                        .startTime(Optional.ofNullable(activityPlan.getActivityStart()).map(Date::getTime).orElse(null))
-                        .endTime(Optional.ofNullable(activityPlan.getActivityEnd()).map(Date::getTime).orElse(null));
+                        .startTime(Optional.ofNullable(activityPlan.getActivityStart()).map(x -> x.getTime() / 1000).orElse(null))
+                        .endTime(Optional.ofNullable(activityPlan.getActivityEnd()).map(x -> x.getTime() / 1000).orElse(null));
             }
         }
 

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

@@ -46,6 +46,7 @@ import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.payment.util.DistributedLock;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -198,8 +199,8 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
                             .activityType(ActivityTypeEnum.SHARE.getCode())
                             .resourceType(ActivityResourceEnum.TEACHER.getCode())
                             .activityState(EStatus.ENABLE.getValue())
-                            .startTime(Optional.ofNullable(activityPlan.getActivityStart()).map(Date::getTime).orElse(null))
-                            .endTime(Optional.ofNullable(activityPlan.getActivityEnd()).map(Date::getTime).orElse(null))
+                            .startTime(Optional.ofNullable(activityPlan.getActivityStart()).map(x -> x.getTime() / 1000).orElse(null))
+                            .endTime(Optional.ofNullable(activityPlan.getActivityEnd()).map(x -> x.getTime() / 1000).orElse(null))
                             .build();
 
                     // 分页查询条件
@@ -207,7 +208,18 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
 
                     IPage<ActivityTeacherWrapper> wrapper = activityEvaluationService.activityTeacherByTimePageInfo(page, query);
 
-                    log.debug("submit ==> {}", JSON.toJSONString(wrapper.getRecords()));
+                    if (CollectionUtils.isNotEmpty(wrapper.getRecords())) {
+
+                        String collect = wrapper.getRecords().stream().map(x -> {
+                            if (StringUtils.isNotEmpty(x.getRealName())) {
+                                return x.getRealName();
+                            }
+                            return x.getUsername();
+                        }).collect(Collectors.joining("、"));
+
+                        throw new BizException("以下老师存在时间冲突:" + collect);
+                    }
+
                 }
 
             }

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

@@ -4,23 +4,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
 import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
 import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
 import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
 import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
+import com.yonge.cooleshow.common.enums.RewardTypeEnum;
 import com.yonge.toolset.base.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
-import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
-import com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao;
-import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
 
 import java.util.Date;
 import java.util.List;
@@ -90,7 +91,9 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
             // 填充老师信息
             for (UserRewardVo item : userRewards) {
 
-                item.teacherName(teacherNameMap.getOrDefault(item.getUserId(), ""))
+                item.rewardType(RewardTypeEnum.valueOf(activityPlan.getShareType()))
+                        .shareType(activityPlan.getShareType())
+                        .teacherName(teacherNameMap.getOrDefault(item.getUserId(), ""))
                         .setTeacherIds(teacherIdMap.getOrDefault(item.getUserId(), ""));
             }
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserRewardVo.java

@@ -49,6 +49,8 @@ public class UserRewardVo implements Serializable {
 	private String teacherName;
 	@ApiModelProperty("关联老师ID ")
 	private String teacherIds;
+	@ApiModelProperty("活动分享类型 ")
+	private String shareType;
 	@ApiModelProperty(hidden = true)
 	private String teacherId;
 
@@ -140,6 +142,14 @@ public class UserRewardVo implements Serializable {
 		this.teacherId = teacherId;
 	}
 
+	public String getShareType() {
+		return shareType;
+	}
+
+	public void setShareType(String shareType) {
+		this.shareType = shareType;
+	}
+
 	public String getTeacherIds() {
 		return teacherIds;
 	}
@@ -153,4 +163,13 @@ public class UserRewardVo implements Serializable {
 		return this;
 	}
 
+	public UserRewardVo rewardType(RewardTypeEnum rewardType) {
+		this.rewardType = rewardType;
+		return this;
+	}
+
+	public UserRewardVo shareType(String shareType) {
+		this.shareType = shareType;
+		return this;
+	}
 }

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

@@ -74,8 +74,8 @@
     <!--分享活动关联老师-->
     <select id="selectActivityShareTeacher" resultType="com.yonge.cooleshow.biz.dal.vo.UserRewardVo">
         SELECT t1.id_ AS teacherId, t1.username_ AS username, t1.real_name_ AS realName, t3.user_id_ AS userId
-        FROM sys_user t1 JOIN activity_evaluation t2 ON t1.id_ = t2.music_sheet_id_ JOIN activity_evaluation_record t3 ON t2.id = t3.evaluation_id_
-        WHERE t3.activity_id_ = #{activityId} AND t3.user_id_ =  IN (<foreach collection="userIds" separator="," item="item">#{item}</foreach>)
+        FROM sys_user t1 JOIN activity_evaluation t2 ON t1.id_ = t2.music_sheet_id_ JOIN activity_evaluation_record t3 ON t2.id_ = t3.evaluation_id_
+        WHERE t3.activity_id_ = #{activityId} AND t3.user_id_ IN (<foreach collection="userIds" separator="," item="item">#{item}</foreach>)
     </select>
     <!--分享活动关联老师-->