From ca5df53433433b2b8103677d23b0dcaf8824b3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 24 May 2024 14:12:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9D=A2=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/LineInfoDAO.java | 5 ++-- .../com/cool/store/mapper/LineInfoMapper.java | 6 +++- .../main/resources/mapper/LineInfoMapper.xml | 28 +++++++++++++++---- .../store/service/impl/DeskServiceImpl.java | 6 ++-- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index b935524af..a15b93363 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -108,11 +108,12 @@ public class LineInfoDAO { List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus); return lineInfo; } - public List listByInterview(String interviewId, Integer interviewType,List subStageStatus) { + public List listByInterview(String interviewId, Integer interviewType,Integer pendingInterviewStatus, + Integer notPassingTheInterview,List subStageStatus) { if (StringUtils.isBlank(interviewId)){ return null; } - List lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,subStageStatus); + List lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatus,notPassingTheInterview,subStageStatus); return lineInfo; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index f8f0c4d32..f83873167 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -33,7 +33,11 @@ public interface LineInfoMapper extends Mapper { * @param codes * @return */ - List listByInterview(@Param("interviewId") String interviewId, @Param("interviewType") Integer interviewType, @Param("codes") List codes); + List listByInterview(@Param("interviewId") String interviewId, + @Param("interviewType") Integer interviewType, + @Param("pendingInterviewStatus") Integer pendingInterviewStatus, + @Param("notPassingTheInterview") Integer notPassingTheInterview, + @Param("codes") List codes); /** * 我的线索列表 diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 33c46a1ff..a535b4efe 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -330,17 +330,33 @@ 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 9124e0493..e9c5e93cd 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 @@ -114,8 +114,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo firstInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.INTERVIEW.getCode(), - Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(), - WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode())); + WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); @@ -147,8 +146,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo secondInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.SECOND_INTERVIEW.getCode(), - Arrays.asList(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(), - WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode())); + WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); From 1733635fa62005c6ab41bf4dff063831207bfaf4 Mon Sep 17 00:00:00 2001 From: guohb Date: Fri, 24 May 2024 15:52:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=B9=E8=AE=B8=E7=BB=8F=E8=90=A5?= =?UTF-8?q?=E5=90=88=E5=90=8C=E6=9C=89=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/ApiErrorCodeEnum.java | 41 +++++++++++++++++++ .../impl/SignFranchiseServiceImpl.java | 25 ++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java new file mode 100644 index 000000000..56b7c5325 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java @@ -0,0 +1,41 @@ +package com.cool.store.enums; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +public enum ApiErrorCodeEnum { + LINE_INFO("lineInfoDO","线索信息确实"), + FRANCHISE_FEE("franchiseFeeDO","缴费信息缺失"), + SIGNING_BASE_INFO("signingBaseInfoDO","签约信息缺失"), + LINE_PAY("linePayDO","缴款信息缺失"), + POINT_INFO("pointInfoDO","铺位信息缺失"), + SYSTEM_BUILDING_SHOP("systemBuildingShopDO","建店数据缺失"), + LICENSE_TRANSACT("licenseTransactDO","证照办理数据缺失"), + THIRD_DEPARTMENT("thirdDepartmentDO","三方部门表缺失"), + ; + + + private String errorMessage; + private String code; + + ApiErrorCodeEnum(String code, String errorMessage) { + this.code = code; + this.errorMessage = errorMessage; + } + + public String getErrorMessage() { + return errorMessage; + } + + public String getCode() { + return code; + } + protected static final Map map = Arrays.stream(values()).collect( + Collectors.toMap(ApiErrorCodeEnum::getCode, Function.identity(), (a, b)->a)); + + public static ApiErrorCodeEnum getByCode(String code) { + return map.get(code); + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index e54fe0c66..df3fede58 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -163,29 +163,52 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu Long shopId = request.getShopId(); //线索信息 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + if (Objects.isNull(lineInfoDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("lineInfoDO").getErrorMessage()); + } //缴费信息 FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(shopId); + if (Objects.isNull(franchiseFeeDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("franchiseFeeDO").getErrorMessage()); + } //线索id Long lineId = shopInfoDO.getLineId(); //签约信息 SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineId); + if (Objects.isNull(signingBaseInfoDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("signingBaseInfoDO").getErrorMessage()); + } //缴款信息 LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId, 1, shopId); + if (Objects.isNull(linePayDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("linePayDO").getErrorMessage()); + } //铺位信息 PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId); + if (Objects.isNull(pointInfoDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("pointInfoDO").getErrorMessage()); + } //建店数据 SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).lineId(lineId).build()); + if (Objects.isNull(systemBuildingShopDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("systemBuildingShopDO").getErrorMessage()); + } //证照办理 LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); + if (Objects.isNull(licenseTransactDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("licenseTransactDO").getErrorMessage()); + } ThirdDepartmentDO thirdDepartmentDO = new ThirdDepartmentDO(); if (Objects.nonNull(systemBuildingShopDO)) { //三方部门表 thirdDepartmentDO = thirdDepartmentMapper.getByName(systemBuildingShopDO.getBigName()); + if (Objects.isNull(thirdDepartmentDO)){ + throw new ServiceException(109014,ApiErrorCodeEnum.getByCode("thirdDepartmentDO").getErrorMessage()); + } } //找不到的url统一用这个 List temp = new ArrayList<>(); temp.add("object"); - Convert.digitToChinese(123); return FranchiseAgreementRequest.builder() // todo .apply_user(user.getJobNumber()) .apply_user("20230724") From 3412a1e44842795256e206af47eb506c1745332f Mon Sep 17 00:00:00 2001 From: guohb Date: Fri, 24 May 2024 16:09:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TrainingExperienceServiceImpl.java | 11 ++--------- .../main/java/com/cool/store/job/XxlJobHandler.java | 6 ------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 9268cbfe9..7b5a1196c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -68,15 +68,8 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr if (currentDate.before(request.getExperienceStartTime())) { leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); - //message -// Map requestMap = new HashMap<>(); -// LineInfoDO byLineId = lineInfoMapper.getByLineId(request.getLineId()); -// requestMap.put("partnerUsername",byLineId.getUsername()); -// requestMap.put("partnerMobile",byLineId.getMobile()); -// requestMap.put("lineId",String.valueOf(request.getLineId())); -// commonService.sendMessage(Collections.singletonList(byLineId.getInvestmentManager()), -// MessageEnum.MESSAGE_32, -// requestMap); + LineInfoDO msgLineInfo = lineInfoMapper.getByLineId(request.getLineId()); + commonService.sendSms(msgLineInfo.getMobile(), SMSMsgEnum.SHOP_EXPERIENCE); } else if (currentDate.after(request.getExperienceStartTime()) || currentDate.before(request.getExperienceEndTime())) { leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode()); lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index e11ba4f64..7493270ba 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -110,12 +110,6 @@ public class XxlJobHandler { WorkflowSubStageStatusEnum storeExperience90 = WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90; lineInfoMapper.toExperiencing(lineIds, storeExperience90.getCode()); - List lineInfos = lineInfoMapper.getByLineIds(lineIds); - Map lineInfoMap = lineInfos.stream().collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getMobile)); - leaseBaseInfoDOS.forEach(e -> { - commonService.sendSms(lineInfoMap.get(e.getLineId()), SMSMsgEnum.SHOP_EXPERIENCE); - }); - log.info("------实训体验状态变更结束------"); XxlJobHelper.handleSuccess(); } From 566d8265ae451e4fa3794b12b2a9882724218833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 24 May 2024 17:11:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9D=A2=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/LineInfoMapper.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index a535b4efe..170543761 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -347,12 +347,7 @@ or (workflow_sub_stage_status = #{notPassingTheInterview} - - and first_interviewer = #{interviewId} - - - and second_interviewer = #{interviewId} - + and investment_manager = #{interviewId} ))