From 82a49a03d2cac28ebeed2de37a54bb13098dfa9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Wed, 14 Jan 2026 11:03:42 +0000 Subject: [PATCH] Merge #26 into master from cc_20260105_partner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:测试 * cc_20260105_partner: (8 commits squashed) - feat:加盟商意向书字段调整 - feat:意向审核 - feat:加盟商意向申请 - feat:新增其他备注 - feat:返回信息缺失 - feat:资质阶段审核完成才回成为加盟商 - feat:大区查询阶段状态是6 - feat:测试 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/26 --- .../com/cool/store/enums/UserRoleEnum.java | 2 +- .../enums/WorkflowSubStageStatusEnum.java | 3 +- .../java/com/cool/store/dao/LineInfoDAO.java | 17 +++-- .../com/cool/store/mapper/LineInfoMapper.java | 5 +- .../main/resources/mapper/LineInfoMapper.xml | 5 ++ .../mapper/QualificationsInfoMapper.xml | 26 +++++++- .../store/entity/QualificationsInfoDO.java | 19 ++++++ .../store/request/JoinIntentionRequest.java | 25 +++++++ .../com/cool/store/vo/PartnerBaseInfoVO.java | 26 ++++++++ .../store/service/impl/BankServiceImpl.java | 24 +++---- .../store/service/impl/DeskServiceImpl.java | 20 ++++-- .../impl/IntentAgreementServiceImpl.java | 2 +- .../impl/JoinIntentionServiceImpl.java | 65 ++++++++++--------- .../store/service/impl/ShopServiceImpl.java | 4 ++ .../impl/TrainingExperienceServiceImpl.java | 8 +-- .../controller/webb/KdzApiController.java | 32 ++++----- 16 files changed, 204 insertions(+), 79 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index 2e92b7707..10df4268e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; public enum UserRoleEnum { INVESTMENT_COMMISSIONER(100000000L, "招商专员"), SELECT_SITE_COMMISSIONER(110000000L, "选址专员"), - REGION_MANAGER(120000000L, "大区执行总经理"), + REGION_MANAGER(120000000L, "招商大区老总"), THEATER_MANAGER(130000000L, "战区经理"), OPERATIONS_MANAGER(140000000L, "营运经理"), TRAINER(150000000L, "训练"), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java index 6a9f78eb3..c0903e2e5 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java @@ -9,7 +9,8 @@ public enum WorkflowSubStageStatusEnum { //意向申请 INTENT_0(0,"待提交"), - INTENT_5(5,"待审核"), + INTENT_5(5,"待招商经理审核"), + INTENT_6(6,"待招商大区老总审核"), INTENT_7(7,"未通过"), //缴纳意向金 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 5df9899f5..846772b12 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 @@ -27,6 +27,7 @@ import org.springframework.stereotype.Repository; import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -72,7 +73,7 @@ public class LineInfoDAO { return lineInfoMapper.updateByPrimaryKeySelective(param); } - public Integer updateWorkflowStage(Long lineId, WorkflowSubStageEnum workflowSubStage, WorkflowSubStageStatusEnum workflowSubStageStatus,String userId) { + public Integer updateWorkflowStage(Long lineId, WorkflowSubStageEnum workflowSubStage, WorkflowSubStageStatusEnum workflowSubStageStatus,String userId,Boolean flag) { if(Objects.isNull(workflowSubStageStatus)){ log.info("更新线索阶段，子阶段 和 子阶段状态不能同时为空"); throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); @@ -85,8 +86,10 @@ public class LineInfoDAO { if(StringUtils.isNotEmpty(userId)){ lineInfo.setUpdateUserId(userId); } - //准加盟商 - lineInfo.setJoinStatus(CommonConstants.ONE); + //资质审核阶段完成 才会到成为加盟商 + if (flag){ + lineInfo.setJoinStatus(CommonConstants.ONE); + } lineInfo.setPartnerNum(RandomEightCharCodeUtils.getCode()); lineInfo.setWorkflowSubStageStatus(workflowSubStageStatus.getCode()); return lineInfoMapper.updateByPrimaryKeySelective(lineInfo); @@ -119,11 +122,11 @@ public class LineInfoDAO { return null; } - public List listByInvestmentManager(String investmentManagerUserId,List subStageStatus,String keyword) { - if (StringUtils.isBlank(investmentManagerUserId)){ - return null; + public List listByInvestmentManager(String investmentManagerUserId,List subStageStatus,String keyword,List authRegionIds) { + if (StringUtils.isBlank(investmentManagerUserId)&&CollectionUtils.isEmpty(authRegionIds)){ + return new ArrayList<>(); } - List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus,keyword); + List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus,keyword, authRegionIds); return lineInfo; } public List listByInterview(String interviewId, Integer interviewType,List pendingInterviewStatusList, 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 3c05dfca6..9a02fffa2 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 @@ -29,7 +29,10 @@ public interface LineInfoMapper extends Mapper { * @param investmentManagerUserId * @return */ - List listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("codes") List codes,@Param("keyword")String keyword); + List listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, + @Param("codes") List codes, + @Param("keyword")String keyword, + @Param("authRegionIds") List authRegionIds); /** * 面试官待处理 diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index afd32cc4f..79dd32f8e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -366,6 +366,11 @@ and (username like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%')) + + + #{regionId} + + order by update_time desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml index 189191285..71e618fe1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml @@ -40,6 +40,12 @@ + + + + + + @@ -76,7 +82,12 @@ financial_manager_name, financial_manager_mobile, business_license, - unified_social_credit_code, + electronic_email, + info_source, + other_remark, + capital_strength, + has_retail_experience, + willing_station_duration, #{request.auditId}, @@ -111,6 +122,12 @@ #{request.financialManagerMobile}, #{request.businessLicense}, #{request.unifiedSocialCreditCode}, + #{request.electronicEmail}, + #{request.infoSource}, + #{request.otherRemark}, + #{request.capitalStrength}, + #{request.hasRetailExperience}, + #{request.willingStationDuration}, ON DUPLICATE KEY UPDATE @@ -146,6 +163,13 @@ financial_manager_mobile = #{request.financialManagerMobile}, business_license = #{request.businessLicense}, unified_social_credit_code = #{request.unifiedSocialCreditCode}, + electronic_email = #{request.electronicEmail}, + info_source = #{request.infoSource}, + other_remark = #{request.otherRemark}, + capital_strength = #{request.capitalStrength}, + has_retail_experience = #{request.hasRetailExperience}, + willing_station_duration = #{request.willingStationDuration}, + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java index 291486bc5..e796c52e5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java @@ -215,4 +215,23 @@ public class QualificationsInfoDO { @Column(name = "unified_social_credit_code") private String unifiedSocialCreditCode; + @Column(name = "electronic_email") + private String electronicEmail; + + @Column(name = "info_source") + private String infoSource; + + @Column(name = "capital_strength") + private Integer capitalStrength; + + @Column(name = "has_retail_experience") + private Integer hasRetailExperience; + + @Column(name = "willing_station_duration") + private Integer willingStationDuration; + + @Column(name = "other_remark") + private String otherRemark; + + } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java index 5f538ee2c..1afdbc555 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java @@ -106,6 +106,25 @@ public class JoinIntentionRequest { @ApiModelProperty("督导") private String supervisor; + @ApiModelProperty("电子邮件") + private String electronicEmail; + + @ApiModelProperty("信息来源") + private String infoSource; + + @ApiModelProperty("信息来源选择其他时 可输入") + private String otherRemark; + + @ApiModelProperty("资金实力") + private Integer capitalStrength; + + @ApiModelProperty("是否有从事零售业经验") + private Integer hasRetailExperience; + + @ApiModelProperty("是否愿意驻点大于等于90小时") + private Integer willingStationDuration; + + public LineInfoDO toLineInfoDO() { LineInfoDO lineInfoDO = new LineInfoDO(); lineInfoDO.setPartnerId(this.partnerId); @@ -158,6 +177,12 @@ public class JoinIntentionRequest { qualificationsInfoDO.setFinancialManagerName(this.financialManagerName); qualificationsInfoDO.setFinancialManagerMobile(this.financialManagerMobile); qualificationsInfoDO.setBusinessLicense(this.businessLicense); + qualificationsInfoDO.setElectronicEmail(this.electronicEmail); + qualificationsInfoDO.setInfoSource(this.infoSource); + qualificationsInfoDO.setCapitalStrength(this.capitalStrength); + qualificationsInfoDO.setHasRetailExperience(this.hasRetailExperience); + qualificationsInfoDO.setWillingStationDuration(this.willingStationDuration); + qualificationsInfoDO.setOtherRemark(this.otherRemark); return qualificationsInfoDO; } } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java index 82eb35d24..5761a9d33 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java @@ -6,6 +6,7 @@ import com.cool.store.entity.QualificationsInfoDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.persistence.Column; import java.util.Date; import java.util.Objects; @@ -111,6 +112,24 @@ public class PartnerBaseInfoVO { @ApiModelProperty("督导手机号") private String supervisorMobile; + @Column(name = "电子邮件") + private String electronicEmail; + + @Column(name = "信息来源 字典") + private String infoSource; + + @Column(name = "资金实力（万元）") + private Integer capitalStrength; + + @Column(name = "是否有从事零售业的经营经验：0-否，1-是") + private Integer hasRetailExperience; + + @Column(name = "是否愿意驻点时长≥90小时：0-否，1-是") + private Integer willingStationDuration; + + @Column(name = "其他备注") + private String otherRemark; + public static PartnerBaseInfoVO from(QualificationsInfoDO qualificationsInfoDO, LineInfoDO lineInfoDO) { if (Objects.isNull(qualificationsInfoDO) && Objects.isNull(lineInfoDO)) { @@ -156,6 +175,13 @@ public class PartnerBaseInfoVO { partnerBaseInfoVO.setSex(Integer.valueOf(lineInfoDO.getSex())); partnerBaseInfoVO.setAreaCode(String.valueOf(lineInfoDO.getWantShopAreaId())); partnerBaseInfoVO.setBigRegionId(lineInfoDO.getBigRegionId()); + + partnerBaseInfoVO.setElectronicEmail(qualificationsInfoDO.getElectronicEmail()); + partnerBaseInfoVO.setInfoSource(qualificationsInfoDO.getInfoSource()); + partnerBaseInfoVO.setCapitalStrength(qualificationsInfoDO.getCapitalStrength()); + partnerBaseInfoVO.setHasRetailExperience(qualificationsInfoDO.getHasRetailExperience()); + partnerBaseInfoVO.setWillingStationDuration(qualificationsInfoDO.getWillingStationDuration()); + partnerBaseInfoVO.setOtherRemark(qualificationsInfoDO.getOtherRemark()); return partnerBaseInfoVO; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java index ff86eaaef..5970c5ef4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java @@ -80,18 +80,18 @@ public class BankServiceImpl extends LineFlowService implements BankService { @Override protected Boolean auditPass(Long auditId, LineInfoDO lineInfo,String userId) { - WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); - WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); - //更新线索阶段 - lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId); - String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, lineInfo.getId()); - redisUtilPool.delKey(key); - HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfo.getUsername()); - map.put("partnerMobile",lineInfo.getMobile()); - commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), - MessageEnum.MESSAGE_6, - map); +// WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); +// WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); +// //更新线索阶段 +// lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId); +// String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, lineInfo.getId()); +// redisUtilPool.delKey(key); +// HashMap map = new HashMap<>(); +// map.put("partnerUsername",lineInfo.getUsername()); +// map.put("partnerMobile",lineInfo.getMobile()); +// commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), +// MessageEnum.MESSAGE_6, +// map); return Boolean.TRUE; } 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 873b476f6..580731188 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 @@ -43,7 +43,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.cool.store.enums.WorkflowSubStageStatusEnum.INTENT_5; +import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; import static com.cool.store.utils.poi.DateUtils.SPECIAL_DATE_START; import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS; @@ -107,8 +107,18 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo intendPendingList(Integer pageNum, Integer pageSize, String userId, String keyword) { - PageHelper.startPage(pageNum, pageSize); - List lineInfoDOS = lineInfoDAO.listByInvestmentManager(userId, Arrays.asList(INTENT_5.getCode()), keyword); + List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(userId); + List lineInfoDOS = null; + if (userRoleIds.contains(UserRoleEnum.REGION_MANAGER.getCode())){ + //大区总 根据管辖查询 + List authRegionIds = userAuthMappingService.getAuthRegionIdByUserId(userId); + PageHelper.startPage(pageNum, pageSize); + lineInfoDOS = lineInfoDAO.listByInvestmentManager(null, Arrays.asList(INTENT_6.getCode()), keyword,authRegionIds); + }else { + PageHelper.startPage(pageNum, pageSize); + lineInfoDOS = lineInfoDAO.listByInvestmentManager(userId, Arrays.asList(INTENT_5.getCode()), keyword,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()); @@ -135,7 +145,7 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user, String keyword) { PageHelper.startPage(pageNum, pageSize); - List lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()), keyword); + List lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()), keyword,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()); @@ -165,7 +175,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user, String keyword) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), - Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()), keyword); + Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()), keyword,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()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index e03b0d203..ec8d9181f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -142,7 +142,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten @Override @Transactional(rollbackFor = Exception.class) - protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) { + public Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) { if (!lineInfo.getWorkflowStage().equals(WorkflowStageEnum.INTENT.getCode())){ throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index faf54f668..74eec5334 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -85,15 +85,6 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt lineInfoParam.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); lineInfoParam.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode()); lineInfoParam.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_5.getCode()); -// if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))) { -// EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode())); -// lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); -// } - //强加盟 前期不确定意向区域 -// if (lineInfoParam.getWantShopAreaId() != null&&lineInfoDO.getJoinMode()==1) { -// Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId()); -// lineInfoParam.setRegionId(regionId); -// } if (StringUtils.isBlank(lineInfoParam.getInvestmentManager()) &&StringUtils.isBlank(lineInfoDO.getInvestmentManager())) { lineInfoParam.setFranchiseBrand(String.valueOf(FranchiseBrandEnum.ZXJP.getCode())); lineInfoParam.setLineStatus(0); @@ -116,32 +107,46 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt @Override @Transactional(rollbackFor = Exception.class) - protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) { + public Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) { WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); - WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); - lineInfoDAO.updateLineInfo(lineInfo); + WorkflowSubStageEnum nextStage = null; + WorkflowSubStageStatusEnum nextStageStatus = null; + Integer workflowSubStageStatus = lineInfo.getWorkflowSubStageStatus(); + Boolean flag = false; + if (WorkflowSubStageStatusEnum.INTENT_5.getCode().equals(workflowSubStageStatus)){ + //如果状态为待加盟商审核 则下一阶段不变 + nextStage = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); + nextStageStatus = WorkflowSubStageStatusEnum.INTENT_6; + }else { + //如果状态为待大区总审核 + nextStage = workflowSubStageEnum.getNextStage(); + nextStageStatus = nextStage.getInitStatus(); + flag = Boolean.TRUE; + } //更新线索阶段 - lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId); + lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStageStatus, userId,flag); //更新加盟问卷信息 qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId()); - QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfo.getId()); - if (StringUtils.isBlank(qualificationsInfoDO.getIdCardNo()) || qualificationsInfoDO.getIdCardNo().length() < 6) { - throw new ServiceException(ErrorCodeEnum.CREATE_PASSWORD_FAIL); + if ( flag ){ + QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfo.getId()); + if (StringUtils.isBlank(qualificationsInfoDO.getIdCardNo()) || qualificationsInfoDO.getIdCardNo().length() < 6) { + throw new ServiceException(ErrorCodeEnum.CREATE_PASSWORD_FAIL); + } + String substring = qualificationsInfoDO.getIdCardNo().substring(qualificationsInfoDO.getIdCardNo().length() - 6); + //生成密码和盐值 + byte[] saltBytes = PasswordUtil.generateSalt(); + String salt = PasswordUtil.bytesToHex(saltBytes); + String password = PasswordUtil.encryptPassword(substring, salt); + GetPasswordDTO getPasswordDTO = new GetPasswordDTO(); + getPasswordDTO.setPassword(substring); + String downstreamSystemSecondaryPassword = thirdXinGuanJiaService.getPassword(getPasswordDTO); + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); + hyPartnerUserInfoDO.setDownstreamSystemPassword(password); + hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(downstreamSystemSecondaryPassword); + hyPartnerUserInfoDO.setDownstreamSystemSalting(salt); + hyPartnerUserInfoDO.setUpdateTime(new Date()); + hyPartnerUserInfoDAO.updatePasswordByPartnerId(hyPartnerUserInfoDO); } - String substring = qualificationsInfoDO.getIdCardNo().substring(qualificationsInfoDO.getIdCardNo().length() - 6); - //生成密码和盐值 - byte[] saltBytes = PasswordUtil.generateSalt(); - String salt = PasswordUtil.bytesToHex(saltBytes); - String password = PasswordUtil.encryptPassword(substring, salt); - GetPasswordDTO getPasswordDTO = new GetPasswordDTO(); - getPasswordDTO.setPassword(substring); - String downstreamSystemSecondaryPassword = thirdXinGuanJiaService.getPassword(getPasswordDTO); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); - hyPartnerUserInfoDO.setDownstreamSystemPassword(password); - hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(downstreamSystemSecondaryPassword); - hyPartnerUserInfoDO.setDownstreamSystemSalting(salt); - hyPartnerUserInfoDO.setUpdateTime(new Date()); - hyPartnerUserInfoDAO.updatePasswordByPartnerId(hyPartnerUserInfoDO); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 4c5c25ac3..325d3a9bb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -804,6 +804,10 @@ public class ShopServiceImpl implements ShopService { } return userList; } + List bigRegionManagerList = Arrays.asList(INTENT_6.getCode()); + if (bigRegionManagerList.contains(lineInfo.getWorkflowSubStageStatus())) { + return getUsersByRolesAndRegion(Arrays.asList(REGION_MANAGER), lineInfo.getInvestRegionId()); + } return userList; } 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 1ef77394b..11d88ddb7 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 @@ -168,10 +168,10 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Override protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) { - WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); - WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); - //更新线索阶段 - lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId); +// WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); +// WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); +// //更新线索阶段 +// lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId); return Boolean.TRUE; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index c62459ae0..8a054523d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -27,22 +27,22 @@ public class KdzApiController { @Resource KdzApiService kdzApiService; - @ApiOperation("审核结果") - @PostMapping("/audit/result") - public ResponseResult auditResult(@PathVariable(value = "enterprise-id") String eid, - @RequestBody XfsgOpenApiRequest request) { - log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); - if (!verifyMD5(request, eid)) { - log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); - return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); - } - if (eid == null || request.getBizContent() == null) { - log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); - return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); - } - AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); - return ResponseResult.success(kdzApiService.auditResult(auditResultRequest)); - } +// @ApiOperation("审核结果") +// @PostMapping("/audit/result") +// public ResponseResult auditResult(@PathVariable(value = "enterprise-id") String eid, +// @RequestBody XfsgOpenApiRequest request) { +// log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); +// if (!verifyMD5(request, eid)) { +// log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); +// return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); +// } +// if (eid == null || request.getBizContent() == null) { +// log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); +// return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); +// } +// AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); +// return ResponseResult.success(kdzApiService.auditResult(auditResultRequest)); +// } @ApiOperation("证照信息回调") @PostMapping("/license")