From f1ef28b7338065cda9afecbba7b062d51903c18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 3 Jul 2023 14:41:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerLineInfoMapper.xml | 7 +------ .../store/dto/calendar/UserCalendarsEventDTO.java | 7 ++++++- .../java/com/cool/store/vo/InviteCodeDetailVO.java | 2 ++ .../java/com/cool/store/service/DeskService.java | 12 ++++++++++++ .../com/cool/store/service/impl/DeskServiceImpl.java | 12 ++++++++++++ .../service/impl/PartnerUserInfoServiceImpl.java | 1 + .../com/cool/store/controller/DeskController.java | 4 +--- 7 files changed, 35 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index c951211a8..996e2cb08 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -262,12 +262,7 @@ and deadline = #{currentDate} - and - ( - (workflow_stage = 1 and workflow_status = 0) or - (workflow_stage = 2 and workflow_status = 0) or - (workflow_stage = 3 and workflow_status = 4) - ) + and (workflow_stage = 2 and workflow_status = 0) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java index e2214530d..832412c9d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java @@ -10,7 +10,7 @@ import lombok.Data; * @date 2023-06-13 11:18 */ @Data -public class UserCalendarsEventDTO { +public class UserCalendarsEventDTO implements Comparable{ @ApiModelProperty("日历id") private String calendarId; @@ -34,4 +34,9 @@ public class UserCalendarsEventDTO { this.startTime = startTime; this.endTime = endTime; } + + @Override + public int compareTo(UserCalendarsEventDTO other) { + return this.startTime.compareTo(other.getStartTime()); + } } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java index 8064ec71f..f6662fad0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java @@ -19,6 +19,8 @@ public class InviteCodeDetailVO { private String partnerPhone; @ApiModelProperty("邀请码") private String inviteCode; + @ApiModelProperty("门店编码") + private String storeCode; @ApiModelProperty("门店名称") private String storeName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java index 69d7382f3..3c9ba0e67 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java +++ b/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 getUserCalendarsEvents(String userId, long startTime, long endTime) throws ApiException; + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 4f309ea13..2300f4127 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/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 getUserCalendarsEvents(String userId, long startTime, long endTime) throws ApiException { + List userCalendarsEvents = isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime); + Collections.sort(userCalendarsEvents); + return userCalendarsEvents; + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index 8b7fb78ac..5bfc6c09a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/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; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 0c25fc733..431a990e4 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -43,8 +43,6 @@ public class DeskController { @Resource HyPartnerBaseInfoService hyPartnerBaseInfoService; @Resource - private ISVHttpRequest isvHttpRequest; - @Resource EnterpriseUserService enterpriseUserService; @Resource PartnerUserInfoService partnerUserInfoService; @@ -78,7 +76,7 @@ public class DeskController { public ResponseResult> getUserCalendarsEvents(@RequestParam(value = "startTime") Long startTime, @RequestParam(value = "endTime") Long endTime) throws ApiException { String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime)); + return ResponseResult.success(deskService.getUserCalendarsEvents(userId,startTime,endTime)); }