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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlan.java

@@ -17,7 +17,6 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.Optional;
 
 /**
  * 活动计划表
@@ -215,7 +214,7 @@ public class ActivityPlan implements Serializable {
     }
 
     public String getShareType() {
-        return Optional.ofNullable(shareType).orElse("");
+        return this.shareType;
     }
 
     public void setShareType(String shareType) {

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

@@ -69,4 +69,12 @@ public interface ActivityEvaluationService extends IService<ActivityEvaluation>
 	 * @return IPage<ActivityTeacherWrapper>
 	 */
 	IPage<ActivityTeacherWrapper> activityTeacherPageInfo(IPage<ActivityTeacherWrapper> page, ActivityTeacherQuery query);
+
+	/**
+	 * 按活动时间匹配老师信息
+	 * @param page IPage<ActivityTeacherWrapper>
+	 * @param query ActivityTeacherQuery
+	 * @return IPage<ActivityTeacherWrapper>
+	 */
+	IPage<ActivityTeacherWrapper> activityTeacherByTimePageInfo(IPage<ActivityTeacherWrapper> page, ActivityTeacherQuery query);
 }

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

@@ -226,4 +226,20 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
         return page.setRecords(wrappers);
     }
 
+    /**
+     * 按活动时间匹配老师信息
+     *
+     * @param page  IPage<ActivityTeacherWrapper>
+     * @param query ActivityTeacherQuery
+     * @return IPage<ActivityTeacherWrapper>
+     */
+    @Override
+    public IPage<ActivityTeacherWrapper> activityTeacherByTimePageInfo(IPage<ActivityTeacherWrapper> page, ActivityTeacherQuery query) {
+
+        // 按时间匹配老师时间
+        List<ActivityTeacherWrapper> wrappers = baseMapper.selectActivityTeacherByTimePageInfo(page, query);
+
+        return page.setRecords(wrappers);
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
@@ -12,6 +13,7 @@ import com.yonge.cooleshow.biz.dal.dto.ActivityPlanDto;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanPayDto;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.SaveOrUpdateRewardDto;
+import com.yonge.cooleshow.biz.dal.dto.activity.ActivityTeacherQuery;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
@@ -35,6 +37,7 @@ import com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo;
 import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.activity.ActivityTeacherWrapper;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.*;
@@ -190,7 +193,21 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
                         || activityPlan.getActivityEnd().getTime() != old.getActivityEnd().getTime()) {
 
                     // 排除当前活动，其他活动时间存在重复
+                    ActivityTeacherQuery query = ActivityTeacherQuery.builder()
+                            .activityId(activityPlan.getId())
+                            .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))
+                            .build();
 
+                    // 分页查询条件
+                    IPage<ActivityTeacherWrapper> page = new Page<>(1, 1000);
+
+                    IPage<ActivityTeacherWrapper> wrapper = activityEvaluationService.activityTeacherByTimePageInfo(page, query);
+
+                    log.debug("submit ==> {}", JSON.toJSONString(wrapper.getRecords()));
                 }
 
             }