日程排序

coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java

@@ -1,10 +1,13 @@
 package com.cool.store.service;
 
+import com.cool.store.dto.calendar.UserCalendarsEventDTO;
+import com.cool.store.exception.ApiException;
 import com.cool.store.vo.InterviewPlanVO;
 import com.cool.store.vo.InterviewScheduleInfoVO;
 import com.cool.store.vo.StageCountVO;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author suzhuhong
@@ -38,6 +41,15 @@ public interface DeskService {
      */
     StageCountVO getStageCountByType(String userId,String type);
 
+    /**
+     * String userId, long startTime, long endTime
+     * @param userId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<UserCalendarsEventDTO> getUserCalendarsEvents(String userId, long startTime, long endTime) throws ApiException;
+
 
 
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java

@@ -5,9 +5,12 @@ import cn.hutool.core.date.DateUtil;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.HyPartnerInterviewPlanDAO;
 import com.cool.store.dao.HyPartnerLineInfoDAO;
+import com.cool.store.dto.calendar.UserCalendarsEventDTO;
 import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO;
 import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
+import com.cool.store.http.ISVHttpRequest;
 import com.cool.store.service.DeskService;
 import com.cool.store.service.HyPartnerInterviewPlanService;
 import com.cool.store.service.HyPartnerLineInfoService;
@@ -21,6 +24,7 @@ import org.apache.http.client.utils.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -40,6 +44,8 @@ public class DeskServiceImpl implements DeskService {
     HyPartnerInterviewPlanService hyPartnerInterviewPlanService;
     @Resource
     HyPartnerLineInfoService hyPartnerLineInfoService;
+    @Resource
+    private ISVHttpRequest isvHttpRequest;
 
     @Override
     public InterviewPlanVO getInterviewPlan(String userId) {
@@ -91,5 +97,11 @@ public class DeskServiceImpl implements DeskService {
         return null;
     }
 
+    @Override
+    public List<UserCalendarsEventDTO> getUserCalendarsEvents(String userId, long startTime, long endTime) throws ApiException {
+        List<UserCalendarsEventDTO> userCalendarsEvents = isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime);
+        Collections.sort(userCalendarsEvents);
+        return userCalendarsEvents;
+    }
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java

@@ -88,6 +88,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         InviteCodeDetailVO inviteCodeDetailVO = new InviteCodeDetailVO();
         inviteCodeDetailVO.setInviteCode(hyPartnerUserInfoDO.getInviteCode());
         inviteCodeDetailVO.setStoreName(hyPartnerUserInfoDO.getRecommendPartnerName());
+        inviteCodeDetailVO.setStoreCode(hyPartnerUserInfoDO.getShopCode());
         inviteCodeDetailVO.setPartnerPhone(hyPartnerUserInfoDO.getRecommendPartnerMobile());
         inviteCodeDetailVO.setPartnerName(hyPartnerUserInfoDO.getShopName());
         return inviteCodeDetailVO;