From ce1415bcfe6e5ce5627bcac21f7efb5c2122b289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Sun, 25 Jun 2023 14:38:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerInterviewPlanMapper.xml | 44 +++++++++---------- .../java/com/cool/store/job/JobHandler.java | 39 +++++++++++----- .../HyPartnerInterviewPlanServiceImpl.java | 3 +- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 640204bc2..6e1ab1f6d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -203,16 +203,16 @@ set room_status = #{roomStatus},update_time = now() - and hpip.room_status = #{record.roomStatus} + and room_status = #{record.roomStatus} - - and hpip.start_time >= #{record.startTime} + + and start_time >= #{record.startTime} - - and hpip.end_time <= #{record.endTime} + + and end_time <= #{record.endTime} - and hpip.deleted = #{deleted} + and deleted = #{deleted} @@ -222,16 +222,16 @@ set room_status = #{roomStatus},update_time = now() - and hpip.room_status = #{record.roomStatus} + and room_status = #{record.roomStatus} - - and hpip.start_time >= #{record.startTime} + + and start_time >= #{record.startTime} - - and hpip.start_time <= #{record.endTime} + + and start_time <= #{record.endTime} - and hpip.deleted = #{deleted} + and deleted = #{deleted} @@ -241,16 +241,16 @@ set room_status = #{roomStatus},update_time = now() - and hpip.room_status = #{record.roomStatus} + and room_status = #{record.roomStatus} - - and hpip.end_time >= #{record.startTime} + + and end_time >= #{record.startTime} - - and hpip.end_time <= #{record.endTime} + + and end_time <= #{record.endTime} - and hpip.deleted = #{deleted} + and deleted = #{deleted} @@ -353,10 +353,10 @@ and hpip.room_status = #{record.roomStatus} - + and hpip.start_time >= #{record.startTime} - + and hpip.end_time <= #{record.endTime} @@ -415,10 +415,10 @@ and partner_id = #{record.partnerId} - + and start_time = #{record.startTime} - + and end_time = #{record.endTime} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java index d5fe9b58c..4f5ae6b51 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java @@ -39,25 +39,40 @@ public class JobHandler { */ @XxlJob("updateInterviewOverTime") public void updateInterviewOverTime(){ - log.info("面试超时定时任务开始"); - hyPartnerInterviewPlanService.updateInterviewOverTime(); - log.info("面试超时定时任务结束"); - XxlJobHelper.handleSuccess(); + try { + log.info("面试超时定时任务开始"); + hyPartnerInterviewPlanService.updateInterviewOverTime(); + log.info("面试超时定时任务结束"); + XxlJobHelper.handleSuccess(); + }catch (Exception e){ + log.error("面试超时定时任务异常",e); + XxlJobHelper.log("面试超时定时任务异常"+e.getMessage()); + } } @XxlJob("openInterviewRoom") public void openInterviewRoom(){ - log.info("房间状态开启定时任务开始"); - hyPartnerInterviewPlanService.openInterviewRoom(); - log.info("房间状态开启定时任务结束"); - XxlJobHelper.handleSuccess(); + try { + log.info("房间状态开启定时任务开始"); + hyPartnerInterviewPlanService.openInterviewRoom(); + log.info("房间状态开启定时任务结束"); + XxlJobHelper.handleSuccess(); + }catch (Exception e){ + log.error("房间状态开启定时任务异常",e); + XxlJobHelper.log("房间状态开启定时任务异常"+e.getMessage()); + } } public void updateAbsentInterview(){ - log.info("面试缺席定时任务开始"); - hyPartnerInterviewPlanService.updateAbsentInterview(); - log.info("面试缺席定时任务结束"); - XxlJobHelper.handleSuccess(); + try { + log.info("面试缺席定时任务开始"); + hyPartnerInterviewPlanService.updateAbsentInterview(); + log.info("面试缺席定时任务结束"); + XxlJobHelper.handleSuccess(); + }catch (Exception e){ + log.error("面试缺席定时任务异常",e); + XxlJobHelper.log("面试缺席定时任务异常"+e.getMessage()); + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 369b0f6a4..891b1ca02 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -174,8 +174,9 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan public void openInterviewRoom() { //更新会议开始时间为十分钟之内的房间状态为开启 Date startTime = new Date(); + String startTimeStr = DateUtil.formatDateTime(startTime); HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setStartTime(startTime); + hyPartnerInterviewPlanDO.setStartTime(DateUtil.parseDateTime(startTimeStr)); hyPartnerInterviewPlanDO.setEndTime(DateUtil.offsetMinute(startTime,10)); hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); hyPartnerInterviewPlanDO.setDeleted(false); From dec1cd6bffee1f39f7fc58c25a164fdf2500e988 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Sun, 25 Jun 2023 14:40:53 +0800 Subject: [PATCH 2/5] fix --- .../cool/store/controller/EnterpriseUserController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java index 56b1a92f6..79b32a704 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java @@ -1,6 +1,8 @@ package com.cool.store.controller; +import com.cool.store.response.ResponseResult; import com.cool.store.service.EnterpriseUserService; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -20,5 +22,10 @@ public class EnterpriseUserController { @Resource public EnterpriseUserService enterpriseUserService; + @ApiOperation("获取开发主管") + @GetMapping("/getDevelopmentDirectorList") + public ResponseResult getDevelopmentDirectorList(@RequestParam("wantShopArea") String wantShopArea){ + return ResponseResult.success(enterpriseUserService.getDevelopmentDirectorList(wantShopArea)); + } } From 2e895b159367fe0591f7b7e2c2aea03ce7cbeeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Sun, 25 Jun 2023 14:44:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/HyPartnerInterviewPlanServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 891b1ca02..369b0f6a4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -174,9 +174,8 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan public void openInterviewRoom() { //更新会议开始时间为十分钟之内的房间状态为开启 Date startTime = new Date(); - String startTimeStr = DateUtil.formatDateTime(startTime); HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setStartTime(DateUtil.parseDateTime(startTimeStr)); + hyPartnerInterviewPlanDO.setStartTime(startTime); hyPartnerInterviewPlanDO.setEndTime(DateUtil.offsetMinute(startTime,10)); hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); hyPartnerInterviewPlanDO.setDeleted(false); From 3a83305062069dc888ae4878941e9486ec37fddb Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Sun, 25 Jun 2023 14:57:28 +0800 Subject: [PATCH 4/5] fix --- .../java/com/cool/store/controller/OssClientController.java | 2 +- .../java/com/cool/store/controller/OssClientController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java index 9f11d1205..ce0f45217 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java @@ -46,7 +46,7 @@ public class OssClientController { @GetMapping("/getUploadFileConfig") public ResponseResult getUploadFileConfig(){ // host的格式为 bucketname.endpoint - String host = "http://" + bucket + "." + endpoint; + String host = "https://" + bucket + "." + endpoint; // 用户上传文件时指定的前缀。 String dir = "partner/" + corpId + "/"; diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java index 1530a54f9..9765ba326 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java @@ -43,7 +43,7 @@ public class OssClientController { @GetMapping("/getUploadFileConfig") public ResponseResult getUploadFileConfig(){ // host的格式为 bucketname.endpoint - String host = "http://" + bucket + "." + endpoint; + String host = "https://" + bucket + "." + endpoint; // 用户上传文件时指定的前缀。 String dir = "partner/" + corpId + "/"; From 3e4d451805fa84e46f6e4904433267ecc032dae2 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Sun, 25 Jun 2023 15:02:29 +0800 Subject: [PATCH 5/5] investmentManager --- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 78fd0bf0b..f93f261a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -542,7 +542,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { Boolean flag = this.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), wantShopArea, acceptAdjustType); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); if (flag){ - hyPartnerLineInfoDO.setInvestmentManager("ou_7a6a19ae800afde783b0ec2dabaabf95"); + String investmentManager = getAssignFollowUser(partnerId, "intent"); + hyPartnerLineInfoDO.setInvestmentManager(investmentManager); } hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); }