From 545f0e62205b9a1731d5e0ed495443717ee0b570 Mon Sep 17 00:00:00 2001 From: pserimal Date: Tue, 20 Jun 2023 11:10:36 +0800 Subject: [PATCH 01/10] =?UTF-8?q?OSSServer=E8=B0=83=E6=95=B4=E4=B8=BACDN?= =?UTF-8?q?=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/oss/OSSServer.java | 5 ++++- .../java/com/cool/store/service/impl/FlowServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java b/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java index 6f6261d31..03f7bfcf9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java @@ -26,6 +26,9 @@ public class OSSServer { @Value("${corp.id:null}") private String corpId; + @Value("${cdn.url:null}") + private String cdnUrl; + /** * 服务端上传文件的方法 * ObjectName 为文件存放位置 + 名字，不可包含 bucket @@ -38,7 +41,7 @@ public class OSSServer { PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, objectName, inputStream); // 创建PutObject请求。 ossClient.putObject(putObjectRequest); - return "http://" + bucket + "." + endpoint + "/" + objectName; + return cdnUrl + "/partner/" + corpId + "/" + objectName; } catch (OSSException oe) { log.error("Caught an OSSException, which means your request made it to OSS, " + "but was rejected with an error response for some reason."); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index bd74b8a3a..c72ac90be 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -260,13 +260,13 @@ public class FlowServiceImpl implements FlowService { ByteArrayOutputStream pdfOut = PassLetterUtils.genPassLetter(partnerName, passCode, verifyCity, passTime); //生成的 pdf 通过函内存输入流 ByteArrayInputStream inputStream = new ByteArrayInputStream(pdfOut.toByteArray()); - String passPdfUrl = ossServer.uploadFileServer(inputStream, "partner/passLetter/" + passCode + ".pdf"); + String passPdfUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".pdf"); //转换为图片 inputStream.reset(); ByteArrayOutputStream imageOut = PDFUtils.pdf2Img(inputStream, 2.0f); inputStream = new ByteArrayInputStream(imageOut.toByteArray()); //上传 OSS - String passImageUrl = ossServer.uploadFileServer(inputStream, "partner/passLetter/" + passCode + ".png"); + String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png"); //计算有效期截止日期 DateTime expiryDate = DateUtil.offsetDay(passTime, 60); HyPartnerInterviewDO interviewDO = new HyPartnerInterviewDO(); From 33e90cf542ce58be2a491832f36e80395dcd8637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 20 Jun 2023 14:06:05 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../mapper/HyPartnerInterviewMapper.xml | 18 +++++++++----- .../mapper/HyPartnerInterviewPlanMapper.xml | 7 ++++++ .../entity/HyPartnerInterviewPlanDO.java | 3 +++ .../cool/store/service/InterviewService.java | 2 +- .../service/impl/InterviewServiceImpl.java | 24 +++++++++++++------ .../store/controller/InterviewController.java | 4 ++-- 7 files changed, 43 insertions(+), 16 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index df99ce566..4e8573fe9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -69,6 +69,7 @@ public enum ErrorCodeEnum { CREATE_CALENDAR_EVENT_FAIL(1021109, "创建面试安排失败！", null), FEISHU_UPDATE_SCHEDULE_ERROR(1021110, "修改面试安排失败！", null), INTERVIEW_STATUS_ERROR(1021111, "面试状态错误！", null), + INTERVIEW_PLAN_ALREADY_EXIST(1021112, "面试计划已存在，请勿重复申请！", null), SIGN_FAIL(600000, "验签失败", null), GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null), NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null), diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index c5dd07b03..ef8ff2273 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -14,8 +14,8 @@ - - + + @@ -87,8 +87,11 @@ auth_code, - - pass_file_url, + + pass_pdf_url, + + + pass_image_url, expiry_date, @@ -152,8 +155,11 @@ #{record.authCode}, - - #{record.passFileUrl}, + + #{record.passPdfUrl}, + + + #{record.passImageUrl}, #{record.expiryDate}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 4f8569509..ab58eb601 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -9,6 +9,7 @@ + @@ -74,6 +75,9 @@ update_time, + + application_approved, + @@ -121,6 +125,9 @@ #{record.updateTime}, + + #{record.applicationApproved}, + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java index 018cff038..3358ec262 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java @@ -66,6 +66,9 @@ public class HyPartnerInterviewPlanDO implements Serializable { @ApiModelProperty("更新时间") private Date updateTime; + @ApiModelProperty("预约是否通过审核：0.未审核1.通过审核") + private Integer applicationApproved; + @ApiModelProperty("飞书日历id") private String feishuCalendarId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java index 2d387e950..6e343168e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java @@ -54,7 +54,7 @@ public interface InterviewService { * @param request * @return */ - CreateAppointmentVO createAppointment(CreateAppointmentReq request); + CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException; /** * 同意面试预约 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 03d894d4b..9b12d5b38 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -28,11 +28,11 @@ import com.cool.store.vo.EnterpriseUserBaseInfoVO; import com.cool.store.vo.interview.CreateAppointmentVO; import com.cool.store.vo.interview.InterviewVO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.Arrays; @@ -208,7 +208,13 @@ public class InterviewServiceImpl implements InterviewService { @Override @Transactional - public CreateAppointmentVO createAppointment(CreateAppointmentReq request) { + public CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException { + HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); + hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId()); + List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); + if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)){ + throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); + } CreateAppointmentVO vo = new CreateAppointmentVO(); //1.创建面试计划 HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); @@ -227,16 +233,19 @@ public class InterviewServiceImpl implements InterviewService { record.setRoomId(StringUtil.generateRoomId(startBookingTime)); record.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); record.setDeleted(false); + record.setApplicationApproved(0); hyPartnerInterviewPlanMapper.insertSelective(record); - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - -// vo.setInterviewPlanId(String.valueOf(interviewPlanId)); + List interviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); + if(CollectionUtils.isEmpty(interviewPlanDOS)){ + throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); + } + Long interviewPlanId = interviewPlanDOS.get(0).getId(); + vo.setInterviewPlanId(String.valueOf(interviewPlanId)); //2.创建面试信息 HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); -// hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId); + hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId); hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId()); hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); hyPartnerInterviewDO.setInterviewer(request.getInterviewerId()); @@ -250,6 +259,7 @@ public class InterviewServiceImpl implements InterviewService { @Override public void approveAppointment(ApproveAppointmentReq request) throws ApiException { + //查询面试计划信息 InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); //如果面试计划不存在，抛出异常 diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java index 179b48ccf..546837d9e 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "加盟商资格面试") @RestController -@RequestMapping("interview") +@RequestMapping("/interview") public class InterviewController { @Autowired @@ -47,7 +47,7 @@ public class InterviewController { @PostMapping("/appointment/submit") @ApiOperation("预约面试") - public ResponseResult createAppointment(@RequestBody CreateAppointmentReq request) { + public ResponseResult createAppointment(@RequestBody CreateAppointmentReq request) throws ApiException { return ResponseResult.success(interviewBaseService.createAppointment(request)); } From 3d98a4741e2159540255f08398699c3bdaf88c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 14:10:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyOpenAreaInfoMapper.xml | 3 +++ .../service/HyPartnerLineInfoService.java | 8 +++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 23 +++++++++++++++---- .../cool/store/config/SignValidateFilter.java | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index 86a29174f..7136184a1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -194,6 +194,9 @@ and area_path like concat('%',#{keyword},'%') + + and (area_status = 'open' or area_status = 'keyOpen') + and area_status = #{areaStatus} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java index c87756b88..9cee7f480 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java @@ -130,6 +130,14 @@ public interface HyPartnerLineInfoService { */ Boolean assignFollowUser(Long lineId); + /** + * 线索状态 + * @param wantShopAreaId + * @param acceptAdjustType + * @return + */ + Boolean getLineStatus(Long wantShopAreaId,Integer acceptAdjustType); + 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 5b2e4f596..434e90380 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 @@ -395,21 +395,34 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return Boolean.FALSE; } HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); + + Boolean lineStatus = getLineStatus(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()), hyPartnerUserInfoDO.getAcceptAdjustType()); + return lineStatus; + } + + /** + * 线索状态 + * @param wantShopAreaId + * @param acceptAdjustType + * @return + */ + @Override + public Boolean getLineStatus(Long wantShopAreaId,Integer acceptAdjustType){ + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(wantShopAreaId); if (AreaStatusEnum.OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.KEY_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())){ return Boolean.TRUE; } if (AreaStatusEnum.NOT_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.SATURATED.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())){ - if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(acceptAdjustType)){ return Boolean.FALSE; } //全国调剂 默认分配呗 有啥好说的 - if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){ return Boolean.TRUE; } //省内调剂 有重点或者开放的 分配 - if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){ Integer apply = hyOpenAreaInfoDAO.getChildrenCount("apply", hyOpenAreaInfoDO.getId()); if (apply>CommonConstants.ZERO){ return Boolean.TRUE; @@ -417,7 +430,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return Boolean.FALSE; } //市内调剂 不分配 - if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){ return Boolean.FALSE; } } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java index 46a60bc72..94a526258 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -51,7 +51,7 @@ public class SignValidateFilter implements Filter { "/partner/mini/program/doc.html","/partner/mini/program/v2/api-docs","/**/test/**", "/partner/mini/program/oss/getUploadFileConfig", "/partner/mini/program/v1/partnerManage/partner/getIdentityCardInfo", - "/**/swagger*/**", "/**/webjars/**"); + "/**/swagger*/**", "/**/webjars/**","/partner/mini/program/v1/partnerManage/openArea/areaApplyQuery"); /** From 5731e874f17a0cb72498cb7550c01e2f52622095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 14:37:34 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=88=98=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyIntendDevMappingDAO.java | 7 ++++++ .../HyIntendDevelopementMappingMapper.java | 2 ++ .../HyIntendDevelopementMappingMapper.xml | 15 ++++++++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 24 +++++++++---------- .../store/service/impl/ZoneServiceImpl.java | 2 +- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java index bbd32f119..c6dd4c626 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java @@ -52,6 +52,13 @@ public class HyIntendDevMappingDAO { return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList); } + public List selectByOpenAreaMappingIdList(List idList){ + if (CollectionUtils.isEmpty(idList)){ + return new ArrayList<>(); + } + return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList); + } + public int batchInsert(List recordList){ if (CollectionUtils.isEmpty(recordList)){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java index 11e58073d..ad61c250b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java @@ -54,4 +54,6 @@ public interface HyIntendDevelopementMappingMapper { * @return */ List selectByMappingIdList(@Param("mappingIdList") List mappingIdList); + + List selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List openAreaMappingIdList); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml index e3f763f7f..d81c6823d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -130,4 +130,19 @@ + + + \ No newline at end of file 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 434e90380..f24fe9f51 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 @@ -247,20 +247,20 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @Override public PageInfo publicSeaLineList(String userId, LineRequest lineRequest) { //确认是招商经理还是部门负责人 - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); - List userIds = new ArrayList<>(); - if (userInfo.getIsLeader()){ - if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){ - List regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class); - List enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true); - userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); - } - }else { - userIds = Arrays.asList(userId); - } +// EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); +// List userIds = new ArrayList<>(); +// if (userInfo.getIsLeader()){ +// if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){ +// List regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class); +// List enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true); +// userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); +// } +// }else { +// userIds = Arrays.asList(userId); +// } PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize()); PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(), - lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds)); + lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null)); List list = publicSeaLineList.getList(); if (CollectionUtils.isEmpty(list)){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java index d114200ef..743a956a2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java @@ -202,7 +202,7 @@ public class ZoneServiceImpl implements ZoneService { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //查询已经绑定战区的 意向区域 - List list = hyIntendDevMappingDAO.selectByMappingIdList(intentAreaSettingRequest.getOpenAreaIdList()); + List list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList()); List openAreaIdList = list.stream().map(ZoneCheckDTO::getOpenAreaMappingId).collect(Collectors.toList()); List hyOpenAreaInfoDOList = openAreaInfoDAO.selectByIds(openAreaIdList); Map areaNameMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName)); From e95638408c5cb9e1461587091431db0d398270a8 Mon Sep 17 00:00:00 2001 From: pserimal Date: Tue, 20 Jun 2023 15:06:37 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=95=86=E8=B5=84?= =?UTF-8?q?=E8=B4=A8=E5=AE=A1=E6=A0=B8=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B5=B0=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HyPartnerCertificationInfoMapper.xml | 2 +- .../mapper/HyPartnerInterviewMapper.xml | 2 +- .../com/cool/store/entity/FraSourceDO.java | 15 ++++ .../request/RpcCreateQualifyVerfyReq.java | 87 ------------------- .../request/RpcCreateQualifyVerifyReq.java | 42 +++++++++ .../store/service/impl/FlowServiceImpl.java | 43 +++++---- .../main/resources/application-dev.properties | 6 +- .../resources/application-local.properties | 5 ++ .../main/resources/application-dev.properties | 7 +- .../resources/application-local.properties | 7 +- 10 files changed, 106 insertions(+), 110 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/FraSourceDO.java delete mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerfyReq.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml index 3e9bc528c..254aaa261 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml @@ -227,7 +227,7 @@ or id = #{record.id} - or partner_id_line_id = #{record.partnerLineId} + or partner_line_id = #{record.partnerLineId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index ef8ff2273..429dd8897 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -47,7 +47,7 @@ id, status, partner_line_id, interview_plan_id, partner_id, deadline, interviewer, - recorder, process_info, record_time, summary, auth_code, qualify_verify_id, pass_file_url, expiry_date, + recorder, process_info, record_time, summary, auth_code, pass_pdf_url, pass_image_url, expiry_date, latest_log_message, pass_reason, certify_file, create_time, update_time, approve_time, partner_enter_time, interviewer_enter_time diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/FraSourceDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/FraSourceDO.java new file mode 100644 index 000000000..ce917a084 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/FraSourceDO.java @@ -0,0 +1,15 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FraSourceDO { + + @ApiModelProperty("key") + private String key; + + @ApiModelProperty("text") + private String text; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerfyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerfyReq.java deleted file mode 100644 index c47ee84a0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerfyReq.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModelProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-14 15:06 - * @Description: - */ -public class RpcCreateQualifyVerfyReq { - @ApiModelProperty(value = "意向签约时间", required = true) - private String intendedSignDate; - - @ApiModelProperty(value = "请求来源", required = true) - private String fraSource; - - @ApiModelProperty(value = "保证金（元）", required = true, example = "5000") - private int amtDeposit; - - @ApiModelProperty(value = "授权码", required = true) - private String authCode; - - @ApiModelProperty(value = "意向签约人", required = true) - private String intendedSigner; - - @ApiModelProperty(value = "手机号", required = true) - private String intendedSignerTel; - - @ApiModelProperty(value = "钉钉用户id", required = true) - private String dingUserId; - - public String getIntendedSignDate() { - return intendedSignDate; - } - - public void setIntendedSignDate(String intendedSignDate) { - this.intendedSignDate = intendedSignDate; - } - - public String getFraSource() { - return fraSource; - } - - public void setFraSource(String fraSource) { - this.fraSource = fraSource; - } - - public int getAmtDeposit() { - return amtDeposit; - } - - public void setAmtDeposit(int amtDeposit) { - this.amtDeposit = amtDeposit; - } - - public String getAuthCode() { - return authCode; - } - - public void setAuthCode(String authCode) { - this.authCode = authCode; - } - - public String getIntendedSigner() { - return intendedSigner; - } - - public void setIntendedSigner(String intendedSigner) { - this.intendedSigner = intendedSigner; - } - - public String getIntendedSignerTel() { - return intendedSignerTel; - } - - public void setIntendedSignerTel(String intendedSignerTel) { - this.intendedSignerTel = intendedSignerTel; - } - - public String getDingUserId() { - return dingUserId; - } - - public void setDingUserId(String dingUserId) { - this.dingUserId = dingUserId; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java new file mode 100644 index 000000000..efe94d3a6 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java @@ -0,0 +1,42 @@ +package com.cool.store.request; + +import com.cool.store.entity.FraSourceDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: young.yu + * @Date: 2023-06-14 15:06 + * @Description: + */ +@Data +public class RpcCreateQualifyVerifyReq { + + @lombok.Data + public class Data { + @ApiModelProperty(value = "意向签约时间", required = true) + private String intendedSignDate; + + @ApiModelProperty(value = "请求来源", required = true) + private FraSourceDO fraSource; + + @ApiModelProperty(value = "保证金（元）", required = true, example = "5000") + private int amtDeposit; + + @ApiModelProperty(value = "授权码", required = true) + private String authCode; + + @ApiModelProperty(value = "意向签约人", required = true) + private String intendedSigner; + + @ApiModelProperty(value = "手机号", required = true) + private String intendedSignerTel; + + } + + @ApiModelProperty(value = "数据体", required = true) + private Data data; + + @ApiModelProperty(value = "钉钉用户id", required = true) + private String dingUserId; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index c72ac90be..7b2c13f50 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -2,7 +2,6 @@ package com.cool.store.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -21,25 +20,23 @@ import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.oss.OSSServer; import com.cool.store.request.CreateQualifyVerifyReq; import com.cool.store.request.QualificationCallbackReq; -import com.cool.store.request.RpcCreateQualifyVerfyReq; +import com.cool.store.request.RpcCreateQualifyVerifyReq; import com.cool.store.request.RpcGetMdmTokenReq; import com.cool.store.service.FlowService; import com.cool.store.utils.PDFUtils; import com.cool.store.utils.PassLetterUtils; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.RestTemplateUtil; -import com.cool.store.vo.PartnerPassLetterDetailVO; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -54,8 +51,15 @@ import java.util.Objects; @Service public class FlowServiceImpl implements FlowService { - // @Value("${hs.mdm.baseUrl}") + @Value("${hs.mdm.baseUrl}") private String mdmBaseUrl; + + @Value("${hs.mdm.appkey}") + private String mdmAppKey; + + @Value("${hs.mdm.appsec}") + private String mdmAppSec; + @Autowired private RedisUtilPool redisUtilPool; @@ -81,14 +85,18 @@ public class FlowServiceImpl implements FlowService { @Transactional public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException { //1.发起加盟商资质审核 - RpcCreateQualifyVerfyReq rpcRequest = new RpcCreateQualifyVerfyReq(); - rpcRequest.setIntendedSignDate(request.getWantSignTime()); - rpcRequest.setFraSource("HSAYPartner"); - rpcRequest.setAmtDeposit(Integer.valueOf(request.getSecurityFund())); + RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq(); + RpcCreateQualifyVerifyReq.Data data = new RpcCreateQualifyVerifyReq().new Data(); + rpcRequest.setData(data); + FraSourceDO fraSourceDO = new FraSourceDO(); + fraSourceDO.setKey("HSAYPartner"); + fraSourceDO.setText("沪上阿姨合伙人"); + data.setFraSource(fraSourceDO); + data.setAmtDeposit(Integer.valueOf(request.getSecurityFund())); //获取授权码 String authCode = null; - if (StringUtils.isBlank(request.getLineId())) { + if (!StringUtils.isBlank(request.getLineId())) { //根据线索id获取线索信息 HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(request.getLineId())); if (!Objects.isNull(hyPartnerLineInfoDO)) { @@ -103,13 +111,13 @@ public class FlowServiceImpl implements FlowService { } rpcRequest.setDingUserId(dingdingUserDO.getUserid()); authCode = generateAuthCode(jobNumber); - rpcRequest.setAuthCode(authCode); + data.setAuthCode(authCode); } } } - rpcRequest.setIntendedSigner(request.getIntentionSignerUsername()); - rpcRequest.setIntendedSignerTel(request.getIntentionSignerMobile()); + data.setIntendedSigner(request.getIntentionSignerUsername()); + data.setIntendedSignerTel(request.getIntentionSignerMobile()); //通过 rpc 请求审核系统获取返回数据 Map qualifyVerifyRespData = JSON.parseObject(createQualifyVerify(rpcRequest), new TypeReference>() {}); @@ -196,16 +204,17 @@ public class FlowServiceImpl implements FlowService { } - public String createQualifyVerify(RpcCreateQualifyVerfyReq rpcRequest) throws ApiException{ + public String createQualifyVerify(RpcCreateQualifyVerifyReq rpcRequest) throws ApiException{ String url = mdmBaseUrl + "/api/openapi/runtime/form/startFraQualExamWithData"; ResponseEntity responseEntity = null; try { RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); - // TODO set appKey 与 appSecret + rpcGetMDMTokenReq.setAppKey(mdmAppKey); + rpcGetMDMTokenReq.setAppSecret(mdmAppSec); Map headers = new HashMap<>(); headers.put("Authorization", getMdmAccessToken(rpcGetMDMTokenReq)); responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); + log.info("url:{}, header:{}, request:{} response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(rpcRequest), JSONObject.toJSONString(responseEntity)); if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { return JSONObject.toJSONString(responseEntity.getBody().getData()); } diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 563263bcf..5f0639fd7 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -58,8 +58,10 @@ weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=77fea013c3a6459685b83c21a2fc3411 -#八佰流程配置 -hs.mdm.baseUrl=http://172.35.37.52:8080 +#MDM +hs.mdm.baseUrl=http://10.56.21.30/ +hs.mdm.appkey = HSAYPartner +hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 #xxljob配置 xxl.job.admin.addresses = https://djob.coolstore.cn/xxl-job-admin diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index e3eb4fe20..643b59023 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -64,6 +64,11 @@ weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=77fea013c3a6459685b83c21a2fc3411 +#MDM +hs.mdm.baseUrl=http://10.56.21.30/ +hs.mdm.appkey = HSAYPartner +hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 + xxl.job.admin.addresses = xxl.job.executor.appname = ${spring.application.name} xxl.job.executor.ip = diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index 295a2a312..523ab9009 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -56,4 +56,9 @@ trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 -signKey=77fea013c3a6459685b83c21a2fc3411 \ No newline at end of file +signKey=77fea013c3a6459685b83c21a2fc3411 + +#MDM +hs.mdm.baseUrl=http://10.56.21.30/ +hs.mdm.appkey = HSAYPartner +hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index 059473d6b..af3619e16 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -63,4 +63,9 @@ trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 -signKey=77fea013c3a6459685b83c21a2fc3411 \ No newline at end of file +signKey=77fea013c3a6459685b83c21a2fc3411 + +#MDM +hs.mdm.baseUrl=http://10.56.21.30/ +hs.mdm.appkey = HSAYPartner +hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 From 828084ef6e5018a0be79d4a4da2fd785f20d8451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 20 Jun 2023 15:29:07 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/CreateAppointmentReq.java | 8 ++--- .../cool/store/service/InterviewService.java | 2 ++ .../store/service/impl/FeiShuServiceImpl.java | 15 ++------- .../service/impl/InterviewServiceImpl.java | 33 +++++++++++++++++-- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java index e27385e98..733c2614a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java @@ -5,10 +5,9 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(description = "面试预约") public class CreateAppointmentReq { - @ApiModelProperty(value = "加盟商用户ID", required = true) + @ApiModelProperty(value = "加盟商用户ID") private String partnerId; - - @ApiModelProperty(value = "面试官id", required = true) + @ApiModelProperty(value = "面试官id") private String interviewerId; @ApiModelProperty(value = "预约开始时间 (YYYY-MM-DD hh:mm:ss)", required = true) @@ -16,7 +15,7 @@ public class CreateAppointmentReq { @ApiModelProperty(value = "预约结束时间 (YYYY-MM-DD hh:mm:ss)", required = true) private String endBookingTime; - @ApiModelProperty(value = "线索id", required = true) + @ApiModelProperty(value = "线索id(如果面试官id，会根据加盟商id和线索id查询面试官)") private Long partnerLineId; public String getPartnerId() { @@ -59,5 +58,4 @@ public class CreateAppointmentReq { this.endBookingTime = endBookingTime; } - } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java index 6e343168e..e4f0d2974 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java @@ -64,4 +64,6 @@ public interface InterviewService { void approveAppointment(ApproveAppointmentReq request) throws ApiException; void reInterview(ReInterviewReq request) throws ApiException; void rejectInterview(RejectInterviewReq request) throws ApiException; + + public String getInterviewerByPartner(String partnerId,String lineId)throws ApiException; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java index 1a9363f4f..032923666 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java @@ -13,6 +13,7 @@ import com.cool.store.mapper.HyPartnerInterviewPlanMapper; import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.request.GetFreeBusyListReq; import com.cool.store.service.FeiShuService; +import com.cool.store.service.InterviewService; import com.cool.store.vo.interview.CalendarInfo; import com.cool.store.vo.interview.FreeBusyInfo; import com.cool.store.vo.interview.GetFreeBusyListVO; @@ -39,7 +40,7 @@ public class FeiShuServiceImpl implements FeiShuService { private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; + private InterviewService interviewService; @Override public GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) throws ApiException { @@ -55,17 +56,7 @@ public class FeiShuServiceImpl implements FeiShuService { } //如果加盟商用户ID不为空且面试官ID为空 if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) { - //根据加盟商用户ID查询面试官ID - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setPartnerId(partnerId); - List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - //如果查询结果为空，则去线索中获取招商经理，面试官只有两个阶段，一个是在第一次申请时不存在面试安排直接取招商经理，第二个时面试信息中可修改面试官信息，这个时候以面试信息中为准 - if (CollectionUtils.isEmpty(hyPartnerInterviewPlanDOS)) { - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(lineId)); - interviewerId = hyPartnerLineInfoDO.getInvestmentManager(); - }else { - interviewerId = hyPartnerInterviewPlanDOS.get(0).getInterviewer(); - } + interviewerId = interviewService.getInterviewerByPartner(partnerId, lineId); } long startTime = 0L; long endTime = 0L; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 9b12d5b38..a7498aaf8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.dto.message.SendCardMessageDTO; import com.cool.store.dto.partner.EnterInterviewDto; import com.cool.store.entity.HyPartnerInterviewDO; import com.cool.store.entity.HyPartnerInterviewPlanDO; +import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageTypeEnum; import com.cool.store.enums.RoomStatus; @@ -19,6 +20,7 @@ import com.cool.store.exception.ServiceException; import com.cool.store.http.ISVHttpRequest; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerInterviewPlanMapper; +import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.request.*; import com.cool.store.service.InterviewService; import com.cool.store.utils.StringUtil; @@ -29,11 +31,11 @@ import com.cool.store.vo.interview.CreateAppointmentVO; import com.cool.store.vo.interview.InterviewVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.Date; @@ -65,6 +67,9 @@ public class InterviewServiceImpl implements InterviewService { @Autowired private ISVHttpRequest isvHttpRequest; + + @Autowired + private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; @Override public List getInterviewList(GetInterviewListReq request) { List interviewList = hyPartnerInterviewPlanMapper.getInterviewList(request); @@ -215,6 +220,10 @@ public class InterviewServiceImpl implements InterviewService { if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)){ throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); } + String interviewrId = request.getInterviewerId(); + if(StringUtils.isEmpty(interviewrId)){ + interviewrId = getInterviewerByPartner(request.getPartnerId(),String.valueOf(request.getPartnerLineId())); + } CreateAppointmentVO vo = new CreateAppointmentVO(); //1.创建面试计划 HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); @@ -227,7 +236,7 @@ public class InterviewServiceImpl implements InterviewService { record.setEndTime(Convert.toDate(request.getEndBookingTime())); record.setPartnerId(request.getPartnerId()); record.setPartnerLineId(request.getPartnerLineId()); - record.setInterviewer(request.getInterviewerId()); + record.setInterviewer(interviewrId); record.setIsPartnerInterview(0); //生成房间号 record.setRoomId(StringUtil.generateRoomId(startBookingTime)); @@ -248,7 +257,7 @@ public class InterviewServiceImpl implements InterviewService { hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId); hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId()); hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); - hyPartnerInterviewDO.setInterviewer(request.getInterviewerId()); + hyPartnerInterviewDO.setInterviewer(interviewrId); hyPartnerInterviewDO.setCreateTime(new Date()); hyPartnerInterviewDO.setUpdateTime(new Date()); hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.RESERVATION_1.getCode())); @@ -322,5 +331,23 @@ public class InterviewServiceImpl implements InterviewService { .append(DateUtil.format(DateUtil.parse(interviewTime), "yyyy年MM月dd日 HH:mm")); return sb.toString(); } + @Override + public String getInterviewerByPartner(String partnerId,String lineId){ + String interviewerId = null; + if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) { + //根据加盟商用户ID查询面试官ID + HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); + hyPartnerInterviewPlanDO.setPartnerId(partnerId); + List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); + //如果查询结果为空，则去线索中获取招商经理，面试官只有两个阶段，一个是在第一次申请时不存在面试安排直接取招商经理，第二个时面试信息中可修改面试官信息，这个时候以面试信息中为准 + if (org.springframework.util.CollectionUtils.isEmpty(hyPartnerInterviewPlanDOS)) { + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(lineId)); + interviewerId = hyPartnerLineInfoDO.getInvestmentManager(); + }else { + interviewerId = hyPartnerInterviewPlanDOS.get(0).getInterviewer(); + } + } + return interviewerId; + } } From 80336c5ce030f9032aa47cdbf40af2221d10e41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 15:43:56 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/constants/RedisConstant.java | 2 ++ .../com/cool/store/utils/RedisConstantUtil.java | 5 +++++ .../resources/mapper/HyPartnerLineInfoMapper.xml | 5 +++-- .../main/java/com/cool/store/vo/BlackListVO.java | 2 +- .../cool/store/service/impl/AliyunServiceImpl.java | 14 ++++++++++++++ .../service/impl/HyPartnerLineInfoServiceImpl.java | 9 ++++++--- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index 688c01bec..381aff8ea 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -220,4 +220,6 @@ public class RedisConstant { public static final String DEVICE_OPEN_TOKEN = "device_open_token:{0}:{1}:{2}"; + public static final String PHONE_NUMBER= "phone_number_"; + } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java index 9ec5d9de8..2105a7c7b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java @@ -90,4 +90,9 @@ public class RedisConstantUtil { public String getRegionNameListKey(String eid, String regionId) { return active + "_" + RedisConstant.REGION_ALL_NAME_CACHE + eid + ":" + regionId; } + + public String getPhoneNumber(String phoneNumber) { + + return active + "_" + RedisConstant.PHONE_NUMBER + phoneNumber; + } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index f0dc5a367..836f5276b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -401,6 +401,7 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java index 6804f4e45..51793bd36 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java @@ -19,7 +19,7 @@ public class BlackListVO { private Long id; @ApiModelProperty("加盟商用户ID") - private String partnerUserId; + private String partnerId; @ApiModelProperty("加盟商用户名称") private String partnerUserName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java index fcbd9bc8f..8642182a9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java @@ -13,11 +13,14 @@ import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.service.AliyunService; +import com.cool.store.utils.RedisConstantUtil; +import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.cuser.IdentityCardInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -37,9 +40,18 @@ import java.util.Optional; @Service public class AliyunServiceImpl implements AliyunService { + @Resource + RedisUtilPool redisUtilPool; + @Resource + RedisConstantUtil redisConstantUtil; + @Override public DescribePhoneNumberDTO getPhoneNumberAttribute(String phoneNumber) { try { + String phone = redisUtilPool.getString(redisConstantUtil.getPhoneNumber(phoneNumber)); + if (StringUtils.isNotEmpty(phone)){ + return JSONObject.parseObject(phone, DescribePhoneNumberDTO.class); + } Config config = new Config(); //todo zcb ak sk替换 config.accessKeyId = "LTAI5t9RaXvABZbHvoXjDFJ1"; @@ -55,6 +67,8 @@ public class AliyunServiceImpl implements AliyunService { log.error("错误信息:" , response.body.message + ""); throw new ServiceException(ErrorCodeEnum.GET_PHONENUMBER_INFO_ERROR); } + //保存到redis + redisUtilPool.setString(redisConstantUtil.getPhoneNumber(phoneNumber),JSONObject.toJSONString(response.body.data)); return JSONObject.parseObject(JSONObject.toJSONString(response.body.data), DescribePhoneNumberDTO.class); } catch (Exception e) { log.error("获取手机号异常：", e); 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 f24fe9f51..86e64a24c 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 @@ -17,6 +17,7 @@ import com.cool.store.exception.ServiceException; import com.cool.store.request.CloseFollowRequest; import com.cool.store.request.LineRequest; import com.cool.store.request.PrivateSeaLineListRequest; +import com.cool.store.service.AliyunService; import com.cool.store.service.EnterpriseUserService; import com.cool.store.service.HyPartnerLineInfoService; import com.cool.store.utils.CoolDateUtils; @@ -58,6 +59,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyOpenAreaInfoDAO hyOpenAreaInfoDAO; @Resource EnterpriseUserService enterpriseUserService; + @Resource + AliyunService aliyunService; @Override public StageCountVO selectStagePendingCount(String userId) { @@ -286,8 +289,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { publicSeaLineListVo.setCreateTime(x.getCreateTime()); publicSeaLineListVo.setPartnerUserName(x.getUserName()); publicSeaLineListVo.setPartnerUserPhone(x.getMobile()); - // TODO: 2023/6/15 手机号归属地 - publicSeaLineListVo.setPhoneAddress(""); + DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(x.getMobile()); + publicSeaLineListVo.setPhoneAddress(phoneNumberAttribute.getCity()); publicSeaLineListVo.setWantShopArea(x.getWantShopArea()); publicSeaLineListVo.setId(x.getLineId()); publicSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); @@ -445,7 +448,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { public BlackListVO convertPartnerBlackListDTOToVo(PartnerBlackListDTO partnerBlackListDTO){ BlackListVO blackListVO = new BlackListVO(); blackListVO.setId(partnerBlackListDTO.getLineId()); - blackListVO.setPartnerUserId(partnerBlackListDTO.getPartnerId()); + blackListVO.setPartnerId(partnerBlackListDTO.getPartnerId()); blackListVO.setPartnerUserName(partnerBlackListDTO.getPartnerUserName()); blackListVO.setPartnerUserPhone(partnerBlackListDTO.getMobile()); blackListVO.setCreateTime(partnerBlackListDTO.getCreateTime()); From 34073bbb2046a6db8658360346b5bb9abac69588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 15:50:50 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-ab.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index 00252356c..0991b3bfc 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -68,4 +68,8 @@ xxl.job.executor.ip = xxl.job.executor.port = 31001 xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 3 -xxl.job.accessToken = \ No newline at end of file +xxl.job.accessToken = + +hs.mdm.baseUrl=http://10.56.21.30/ +hs.mdm.appkey = HSAYPartner +hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 From 1d3b44b70a567799728353fdfedeae7011b61430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 20 Jun 2023 15:58:30 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../com/cool/store/request/CreateAppointmentReq.java | 4 ++-- .../cool/store/service/impl/InterviewServiceImpl.java | 10 ++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 4e8573fe9..abaf2eed2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -70,6 +70,7 @@ public enum ErrorCodeEnum { FEISHU_UPDATE_SCHEDULE_ERROR(1021110, "修改面试安排失败！", null), INTERVIEW_STATUS_ERROR(1021111, "面试状态错误！", null), INTERVIEW_PLAN_ALREADY_EXIST(1021112, "面试计划已存在，请勿重复申请！", null), + INTERVIEW_PLAN_ID_IS_NULL(1021113, "面试计划Id为空！", null), SIGN_FAIL(600000, "验签失败", null), GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null), NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null), diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java index 733c2614a..8b07dd714 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(description = "面试预约") public class CreateAppointmentReq { - @ApiModelProperty(value = "加盟商用户ID") + @ApiModelProperty(value = "加盟商用户ID", required = true) private String partnerId; @ApiModelProperty(value = "面试官id") private String interviewerId; @@ -15,7 +15,7 @@ public class CreateAppointmentReq { @ApiModelProperty(value = "预约结束时间 (YYYY-MM-DD hh:mm:ss)", required = true) private String endBookingTime; - @ApiModelProperty(value = "线索id(如果面试官id，会根据加盟商id和线索id查询面试官)") + @ApiModelProperty(value = "线索id(如果面试官id，会根据加盟商id和线索id查询面试官)", required = true) private Long partnerLineId; public String getPartnerId() { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index a7498aaf8..0e0cc2b13 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -107,8 +107,7 @@ public class InterviewServiceImpl implements InterviewService { DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); deleteCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); - //TODO 这里的userId是原面试官的userId还是新的？ - deleteCalendarEventDTO.setUserId(request.getNewInterviewerId()); + deleteCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.deleteUserCalendarEvent(deleteCalendarEventDTO); if(userCalendarsEventDTO == null ){ throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); @@ -214,11 +213,14 @@ public class InterviewServiceImpl implements InterviewService { @Override @Transactional public CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException { + if(request.getPartnerLineId() == null || request.getPartnerLineId()<=0){ + throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ID_IS_NULL); + } HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId()); List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)){ - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); + if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)&&hyPartnerInterviewPlanDOS.get(0).getId()!=null){ + throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ID_IS_NULL); } String interviewrId = request.getInterviewerId(); if(StringUtils.isEmpty(interviewrId)){ From 9115bd01484b5b66141e813295355c8ac7ec34a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 16:19:08 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E6=97=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- .../main/java/com/cool/store/service/DeskService.java | 2 +- .../com/cool/store/service/impl/DeskServiceImpl.java | 11 +++++++---- .../com/cool/store/controller/DeskController.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 836f5276b..b41f58754 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -320,7 +320,7 @@ and investment_manager = #{userId} - and close_time > #{lastMonthTodayDate} and close_time now + and close_time > #{lastMonthTodayDate} and close_time now() 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 c95b5b7e2..69d7382f3 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 @@ -28,7 +28,7 @@ public interface DeskService { * @param selectedData * @return */ - InterviewScheduleInfoVO interviewSchedule(String userId,Date selectedData); + InterviewScheduleInfoVO interviewSchedule(String userId,String selectedData); /** * 招商经理 各阶段 待处理 待跟进数量 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 e33bd2651..c27ad9bab 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 @@ -16,6 +16,7 @@ import com.cool.store.vo.InterviewPlanVO; import com.cool.store.vo.InterviewScheduleInfoVO; import com.cool.store.vo.StageCountVO; import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.utils.DateUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -53,15 +54,17 @@ public class DeskServiceImpl implements DeskService { } @Override - public InterviewScheduleInfoVO interviewSchedule(String userId,Date selectedData) { + public InterviewScheduleInfoVO interviewSchedule(String userId,String selectedData) { if (StringUtils.isEmpty(userId)||selectedData==null){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } + Date date = DateUtils.parseDate(selectedData); InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO(); //查询面试数量 - String currentDate = DateUtil.format(selectedData, CoolDateUtils.DATE_FORMAT_DAY); - String startTime = DateUtil.format(selectedData, CoolDateUtils.DATE_FORMAT_SEC); - String endTime = DateUtil.format(CoolDateUtils.getDateBefore(selectedData, 7), CoolDateUtils.DATE_FORMAT_SEC); + + String currentDate = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_DAY); + String startTime = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_SEC); + String endTime = DateUtil.format(CoolDateUtils.getDateBefore(date, 7), CoolDateUtils.DATE_FORMAT_SEC); SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); interviewScheduleInfoVO.setCurrentDayInterviewCount(interviewCount.getCurrentDayInterviewCount()); 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 8181e0ffd..988ee1317 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 @@ -50,7 +50,7 @@ public class DeskController { @GetMapping(path = "/interviewSchedule") @ApiOperation("面试日程信息 面试信息有限 不做分页") - public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){ + public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) String selectedData){ String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(deskService.interviewSchedule(userId,selectedData));