From dc22d18322d28087422eb98164785474618afc69 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Wed, 21 Jan 2026 19:04:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E9=98=B6=E6=AE=B5=20=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=8E=A8=E9=80=81=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=80=E5=B0=8F=E6=97=B6=E8=87=AA=E5=8A=A8=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SignFranchiseServiceImpl.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) 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 618c74fae..fa41eb8fd 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 @@ -257,9 +257,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, user.getUserId(), auditFranchiseFeeUsers, OperationTypeEnum.OPERATION_TYPE_1, "加盟签约合同审批", OperationStatusEnum.NOT_PROCESSED, 1); - operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83_5, - user.getUserId(), financeUsers, - OperationTypeEnum.OPERATION_TYPE_1, "加盟签约合同财务审批", OperationStatusEnum.NOT_PROCESSED, 2); } else { //修改签约人信息 signFranchiseMapper.updateByPrimaryKeySelective(signFranchiseDO); @@ -337,9 +334,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, user.getUserId(), userIds, OperationTypeEnum.OPERATION_TYPE_1, "加盟签约合同审批", OperationStatusEnum.NOT_PROCESSED, 1); - operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83_5, - user.getUserId(), financeUsers, - OperationTypeEnum.OPERATION_TYPE_1, "加盟签约合同财务审批", OperationStatusEnum.NOT_PROCESSED, 2); return Boolean.TRUE; } @@ -464,6 +458,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); //驳回 + ContractCallbackDTO contractCallbackDTO = null; if (Constants.ZERO_INTEGER.equals(request.getAuditResult())) { auditReject(request, shopAuditInfoDO, shopInfoDO); } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { @@ -472,7 +467,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //更新状态为加盟商 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); shopStageInfoDAO.updateShopStageInfo(shopId, SHOP_SUB_STAGE_STATUS_83_5); - + //推送数据 + contractCallbackDTO = pushContractRequest(shopInfoDO, request.getShopId()); Boolean sendNotice = Boolean.TRUE; if (sendNotice) { HashMap map = new HashMap<>(); @@ -484,6 +480,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.nonNull(userDOList)) { finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } + operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83_5, + user.getUserId(), userDOList, + OperationTypeEnum.OPERATION_TYPE_1, "加盟签约合同财务审批", OperationStatusEnum.NOT_PROCESSED, 2); commonService.sendQWMessage(finances, MessageEnum.MESSAGE_19_1, map); @@ -491,7 +490,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); Long auditId = shopAuditInfoDO.getId(); - signFranchiseDAO.updateAuditByShopId(auditId, shopId); + if (contractCallbackDTO != null && StringUtils.isNotEmpty(contractCallbackDTO.getStoreCode())) { + shopInfoDO.setShopCode(contractCallbackDTO.getStoreCode()); + shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); + } + signFranchiseDAO.updateAuditByShopId(auditId, shopId, contractCallbackDTO); //审批记录表记录 List operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, OperationTypeEnum.OPERATION_TYPE_1.getCode()); operationLogService.batchUpdateProcessed(operationLogs, auditId, user.getUserId(), request.getCause()); @@ -557,7 +560,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); //驳回 - ContractCallbackDTO contractCallbackDTO = null; if (Constants.ZERO_INTEGER.equals(request.getAuditResult())) { auditReject(request, shopAuditInfoDO, shopInfoDO); } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { @@ -590,7 +592,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopDecorationAssignDO.setShopId(shopId); shopDecorationAssignDAO.insert(shopDecorationAssignDO); //新增一个延迟队列 四个小时之后确定是否手动分配 没有手动分配 直接自动分配 红圈通推送和下一个流程开始改为分配团队之后 触发 - simpleMessageService.send(String.valueOf(shopDecorationAssignDO.getId()), RocketMqTagEnum.DELAY_SHOP_DECORATION_ASSIGN, System.currentTimeMillis() + 4 * 60 * 60 * 1000); + simpleMessageService.send(String.valueOf(shopDecorationAssignDO.getId()), RocketMqTagEnum.DELAY_SHOP_DECORATION_ASSIGN, System.currentTimeMillis() + 1 * 60 * 60 * 1000); } shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); @@ -616,8 +618,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu preparationService.contractAndBuildStoreCompletion(request.getShopId()); } - //推送数据 - contractCallbackDTO = pushContractRequest(shopInfoDO, request.getShopId()); Boolean sendNotice = Boolean.TRUE; commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT); @@ -633,11 +633,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); Long auditId = shopAuditInfoDO.getId(); - if (contractCallbackDTO != null && StringUtils.isNotEmpty(contractCallbackDTO.getStoreCode())) { - shopInfoDO.setShopCode(contractCallbackDTO.getStoreCode()); - shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); - } - signFranchiseDAO.updateAuditByShopId(auditId, shopId, contractCallbackDTO); + signFranchiseDAO.updateAuditByShopId(auditId, shopId); //审批记录表记录 List operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83_5, OperationTypeEnum.OPERATION_TYPE_1.getCode()); operationLogService.batchUpdateProcessed(operationLogs, auditId, user.getUserId(), request.getCause());