From 01b0284dc0fbf7489a00895e529b0af6f1ca9158 Mon Sep 17 00:00:00 2001 From: pserimal Date: Thu, 29 Jun 2023 22:07:49 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=8D=87=E7=BA=A7icepdf=E4=BB=8E6.1.2?= =?UTF-8?q?=E5=88=B06.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coolstore-partner-common/pom.xml | 2 +- .../src/main/java/com/cool/store/utils/PDFUtils.java | 2 +- .../java/com/cool/store/service/impl/FlowServiceImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/pom.xml b/coolstore-partner-common/pom.xml index 988014f8a..f8d5208ab 100644 --- a/coolstore-partner-common/pom.xml +++ b/coolstore-partner-common/pom.xml @@ -102,7 +102,7 @@ org.icepdf.os icepdf-core - 6.1.2 + 6.2.2 javax.media diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java index f7ee13f9d..0bb7375f2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java @@ -155,7 +155,7 @@ public class PDFUtils { document.dispose(); return outputStream; } - } catch (PDFException | IOException | PDFSecurityException e) { + } catch (PDFException | IOException | InterruptedException | PDFSecurityException e) { log.error("PDF转图片异常, e{}", e.getMessage()); } finally { try { 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 26a15a63b..706447114 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 @@ -146,7 +146,7 @@ public class FlowServiceImpl implements FlowService { String jobNumber = investmentManager.getJobnumber(); String mobile = investmentManager.getMobile(); DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); - if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) { + if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) { throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST); } rpcRequest.setDingUserId(dingdingUserDO.getUserid()); @@ -158,7 +158,7 @@ public class FlowServiceImpl implements FlowService { if (!Objects.isNull(developmentDirector)) { String mobile = developmentDirector.getMobile(); DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); - if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) { + if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) { throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST); } rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid()); @@ -217,7 +217,6 @@ public class FlowServiceImpl implements FlowService { } @Override - @Transactional public void qualificationCallback(QualificationCallbackReq request) { log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request)); //1. 信息是否完整 @@ -252,6 +251,7 @@ public class FlowServiceImpl implements FlowService { // TODO pass_reason 暂无 Date passDate = new Date(request.getModifiedTime()); //3. 生成通过函并修改数据库相关信息 + //TODO 问题：如果因为 pdf 生成失败或者其他原因导致异常，但是由于 MDM 只是做回调，不对回调是否成功负责，会导致流程信息缺失 genPassLetterAndUpdateDB(partnerName, verifyCity, passDate, interviewId); // TODO 4. 修改流程状态到下一阶段 4 分配选址开发经理 //审核未通过 From 2e2bcb02d898bb8110823e2c37df931cc7cdbb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 30 Jun 2023 09:27:02 +0800 Subject: [PATCH 02/10] 222 --- .../java/com/cool/store/enums/OperateTypeEnum.java | 2 +- .../service/impl/HyPartnerLineInfoServiceImpl.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java index 16b374556..76f8270d8 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java @@ -15,7 +15,7 @@ public enum OperateTypeEnum { ALLOCATION_INVESTMENT_MANAGER("allocation_investment_manager", "分配招商经理", Arrays.asList(ALLOCATION_USERID,ALLOCATION_USERNAME, MOBILE, OPERATE_TIME)), ADD_BLACKLIST("add_blacklist", "加入黑名单", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REASON)), - REMOVE_BLACKLIST("add_blacklist", "移除黑名单", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REASON)), + REMOVE_BLACKLIST("remove_blacklist", "移除黑名单", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REASON)), CLOSE_FOLLOW("close_follow", "结束跟进", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REJECT_PUBLIC_REASON, REJECT_REAL_REASON, CERTIFY_FILE)), TRANSFER_INVESTMENT_MANAGER("transfer_investment_manager", "转让招商经理", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INVESTMENT_MANAGER_USERNAME, BEFORE_INVESTMENT_MANAGER_MOBILE, AFTER_INVESTMENT_MANAGER_USERNAME, AFTER_INVESTMENT_MANAGER_MOBILE)), INTERVIEW_APPOINTMENT("interview_appointment", "预约面试时间", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)), 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 a76b68ac4..46a100fa7 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 @@ -250,6 +250,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } HyPartnerLineInfoDO line = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); + Integer lineStatus = line.getLineStatus(); //加入黑名单 阶段回到第一步待提交状态 HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); hyPartnerLineInfoDO.setId(lineId); @@ -260,10 +261,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { hyPartnerLineInfoDO.setCloseUserId(user.getUserId()); hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); - closeFollowRequest.setLineId(lineId); - closeFollowRequest.setRejectRealReason(joinReason); - workFlowService.endProcess(WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()),closeFollowRequest); + //公海线索不需要处理子流程线索 + if (!LineStatusEnum.PUBLIC_SEAS.getCode().equals(lineStatus)){ + CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); + closeFollowRequest.setLineId(lineId); + closeFollowRequest.setRejectRealReason(joinReason); + workFlowService.endProcess(WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()),closeFollowRequest); + } //添加日志 LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(), From 09ead622dcd50f75fa5f64dafb556dd40d100fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 30 Jun 2023 09:37:45 +0800 Subject: [PATCH 03/10] wantShopAreaName --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- .../cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 73cb03733..a6886a756 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -499,7 +499,7 @@ AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart} - and b.want_shop_area like concat('%/',#{intentAreaName},'/%') + and hpuinfo.want_shop_area like concat('%/',#{intentAreaName},'/%') AND hpuinfo.accept_adjust_type = #{acceptAdjustType} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 45207ef99..e59b539d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -285,6 +285,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){ intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType()); } + intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); return intentInfoVO; } From 594ad18db754d80cef4d9f597a843b0888e1945a Mon Sep 17 00:00:00 2001 From: pserimal Date: Fri, 30 Jun 2023 10:33:49 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E9=9D=A2=E8=AF=95=E9=80=9A=E8=BF=87=E5=87=BD=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerInterviewMapper.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index eb2ae9b31..9731a5760 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -43,7 +43,7 @@ - + @@ -317,7 +317,9 @@ @@ -328,7 +330,7 @@ WHERE id = ( SELECT want_shop_area FROM hy_partner_intent_info - WHERE partner_id = #{partner_id} + WHERE partner_line_id = #{partner_line_id} )