From cd48677507bd4eb40b6c55f9aad4915539654312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Jul 2024 16:50:09 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A4=A7=E5=8C=BA=E6=A6=82=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/request/AuditPassRequest.java | 3 --- .../service/impl/IntentAgreementServiceImpl.java | 4 +--- .../store/service/impl/JoinIntentionServiceImpl.java | 4 ++-- .../com/cool/store/service/impl/LineFlowService.java | 3 --- .../com/cool/store/service/impl/LineServiceImpl.java | 6 ++---- .../cool/store/service/impl/PointServiceImpl.java | 12 ++++++------ .../com/cool/store/service/impl/ShopServiceImpl.java | 3 +-- .../service/impl/UserAuthMappingServiceImpl.java | 4 ++-- 8 files changed, 14 insertions(+), 25 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java index dca04c48c..23e851ec2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java @@ -26,7 +26,4 @@ public class AuditPassRequest { @ApiModelProperty("通过原因") private String passReason; - @ApiModelProperty("战区regionId,只在意向加盟申请阶段使用") - private Long fightRegion; - } 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 c6cb3dc1a..55bead3c1 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,9 +142,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten updateLine.setId(lineInfo.getId()); updateLine.setWorkflowStage(WorkflowStageEnum.STORE.getCode()); updateLine.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode()); - EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SELECT_SITE_COMMISSIONER, lineInfo.getWantShopAreaId()); - String developmentManager = Optional.ofNullable(enterpriseUser).map(EnterpriseUserDO::getUserId).orElse(null); - updateLine.setDevelopmentManager(developmentManager); + updateLine.setDevelopmentManager(lineInfo.getInvestmentManager()); updateLine.setUpdateUserId(userId); lineInfoDAO.updateLineInfo(updateLine); //初始化店铺 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 5d9ba0467..c40a5458e 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 @@ -77,13 +77,13 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt 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.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode())); + EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode())); lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); } lineInfoParam.setLineStatus(1); if (lineInfoParam.getWantShopAreaId() != null) { Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId()); - lineInfoParam.setBigRegionId(regionId); + lineInfoParam.setRegionId(regionId); } lineInfoDAO.insertOrUpdate(lineInfoParam); QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java index 5f10f94c2..234cc9e4e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java @@ -48,9 +48,6 @@ public abstract class LineFlowService { if(!lineInfo.getWorkflowSubStage().equals(request.getWorkflowSubStage())){ throw new ServiceException(ErrorCodeEnum.WORK_FLOW_STAGE_PASS_ERROR); } - if (WorkflowSubStageEnum.INTEND.getCode().equals(lineInfo.getWorkflowSubStage())){ - lineInfo.setRegionId(request.getFightRegion()); - } String partnerId = lineInfo.getPartnerId(); LineAuditInfoDO auditInfo = new LineAuditInfoDO(); auditInfo.setLineId(request.getLineId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 9e79f47d1..692b497ca 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -102,14 +102,11 @@ public class LineServiceImpl implements LineService { result.setInvestmentManagerName(user.getName()); result.setInvestmentManagerMobile(user.getMobile()); } - result.setBigRegionId(lineInfo.getBigRegionId()); if(lineInfo.getRegionId() != null && lineInfo.getRegionId() != 0){ Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId()); Map regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId())); result.setRegionId(lineInfo.getRegionId()); result.setRegionName(regionNameMap.get(lineInfo.getRegionId())); - result.setLargeRegionId(bigRegionIdByAreaId); - result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId)); } LineAuditInfoDO lineAuditInfoDO = lineAuditInfoDAO.getAuditInfoByLineId(lineInfo.getId()); if (lineAuditInfoDO!=null){ @@ -416,7 +413,8 @@ public class LineServiceImpl implements LineService { if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){ userId = addLineRequest.getInvestmentManagerUserId(); }else { - EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, addLineRequest.getWantShopAreaId()); + //督导角色是招商专员 + EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId()); userId = user.getUserId(); } Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 719d55d2c..b36c9ee8a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -988,12 +988,12 @@ public class PointServiceImpl implements PointService { requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); requestMap.put("shopId",String.valueOf(shopId)); - if (Objects.nonNull(shopInfo.getShopName())) { - requestMap.put("storeName",shopInfo.getShopName()); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); - }else { - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap); - } +// if (Objects.nonNull(shopInfo.getShopName())) { +// requestMap.put("storeName",shopInfo.getShopName()); +// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); +// }else { +// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap); +// } } return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId); } 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 7b0a2a7d7..a7cae8201 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 @@ -70,8 +70,7 @@ public class ShopServiceImpl implements ShopService { shopInfo.setPartnerId(lineInfo.getPartnerId()); //初始化 shopInfo.setStoreNum(RandomEightCharCodeUtils.getCode()); - EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfo.getRegionId()); - shopInfo.setSupervisorUserId((Objects.isNull(supervisor)||supervisor.getUserId()==null)?lineInfo.getInvestmentManager():supervisor.getUserId()); + shopInfo.setSupervisorUserId(lineInfo.getInvestmentManager()); shopInfo.setShopName("店铺" + NumberConverter.convertArabicToChinese(i + 1)); addShopList.add(shopInfo); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index 28c83a305..0d442bda9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -225,8 +225,8 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) { String defaultJobnumber = getDefaultJobnumber(userRoleEnum); - // 如果找不到招商专员，则分配给默认的招商经理 - if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) { + // 如果找不到督导，则分配给默认的督导 + if (UserRoleEnum.SUPERVISION.equals(userRoleEnum)) { EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(defaultJobnumber); if (defaultUser == null) { defaultUser = enterpriseUserDAO.getUserInfoById(defaultJobnumber); From 86dee574fcdb101d025ee856050e813e6ebe9b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Jul 2024 20:05:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A4=A7=E5=8C=BA=E6=A6=82=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/RegionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java index b0c61fe62..51fa8dae0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java @@ -97,7 +97,7 @@ public class RegionServiceImpl implements RegionService { RegionPathNameVO regionPathNameVO = this.getAllRegionName(regionId); if(regionPathNameVO != null && StringUtils.isNotBlank(regionPathNameVO.getAllRegionName())){ String allRegionName = regionPathNameVO.getAllRegionName(); - return allRegionName.substring(allRegionName.indexOf(Constants.M_LINE) + 1); + return allRegionName.substring(0,allRegionName.indexOf(Constants.M_LINE)); } return ""; } From 61622f4086d672f235425af33b35ae50820c6d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Jul 2024 20:19:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A4=A7=E5=8C=BA=E6=A6=82=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/RegionServiceImpl.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java index 51fa8dae0..8f2a8fece 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java @@ -94,10 +94,9 @@ public class RegionServiceImpl implements RegionService { @Override public String getBelongWarRegionName(Long regionId) { - RegionPathNameVO regionPathNameVO = this.getAllRegionName(regionId); - if(regionPathNameVO != null && StringUtils.isNotBlank(regionPathNameVO.getAllRegionName())){ - String allRegionName = regionPathNameVO.getAllRegionName(); - return allRegionName.substring(0,allRegionName.indexOf(Constants.M_LINE)); + RegionDO regionDO = regionMapper.getByRegionId(regionId); + if(regionDO != null){ + return regionDO.getName(); } return ""; } @@ -107,11 +106,8 @@ public class RegionServiceImpl implements RegionService { if(CollectionUtils.isEmpty(regionIds)){ return Maps.newHashMap(); } - Map regionNameMap = Maps.newHashMap(); - for (Long regionId : regionIds) { - regionNameMap.put(regionId, getBelongWarRegionName(regionId)); - } - return regionNameMap; + List regionList = regionMapper.getByIds(regionIds); + return regionList.stream().collect(Collectors.toMap(RegionDO::getId, RegionDO::getName)); } /** From f897e859697209e549c1bfe1dcd5c769925bf2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 3 Jul 2024 15:11:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=9D=A3=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/ShopStageInfoDAO.java | 4 ++-- .../com/cool/store/mapper/ShopStageInfoMapper.java | 4 +--- .../src/main/resources/mapper/ShopStageInfoMapper.xml | 10 ++-------- .../com/cool/store/service/impl/DeskServiceImpl.java | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 39bc3906a..97bf9f3ed 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -247,8 +247,8 @@ public class ShopStageInfoDAO { } public List getSpecialShopStageInfo(List shopIds, Integer shopSubStage, - List shopSubStageStatusList,String investmentUserId,String supervisorId,Integer queryUserType){ - return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId,supervisorId,queryUserType); + List shopSubStageStatusList,String investmentUserId){ + return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId); } /** * @Auther: wangshuo diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index f82f42c3c..52ab2d84b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -130,9 +130,7 @@ public interface ShopStageInfoMapper extends Mapper { List getSpecialShopStageInfo(@Param("shopIds") List shopIds, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatusList") List shopSubStageStatusList, - @Param("investmentUserId") String investmentUserId, - @Param("supervisorId") String supervisorId, - @Param("queryUserType") Integer queryUserType); + @Param("investmentUserId") String investmentUserId); List getSubStageList(@Param("shopIds") List shopIds,@Param("shopSubStage") Integer shopSubStage); /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index aa10ad2c7..483884e19 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -234,12 +234,9 @@ select * from xfsg_shop_stage_info a - + left join xfsg_line_info b on a.line_id = b.id - - left join xfsg_system_building_shop c on a.shop_id = c.shop_id - and a.shop_id in @@ -256,12 +253,9 @@ #{stageStatus} - + and b.investment_manager = #{investmentUserId} - - and c.supervisor_id = #{supervisorId} - 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 1554e7edc..35d28ef7a 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 @@ -365,7 +365,7 @@ public class DeskServiceImpl implements DeskService { PageHelper.startPage(pageNum, pageSize); //user.getJobNumber() List specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), - subStageStatusList, user.getUserId(),user.getJobNumber(),type); + subStageStatusList, user.getUserId()); PageInfo result = new PageInfo<>(specialShopStageInfo); List shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); From d658eba78b8ec2f216f1ea903df98bf21d5b60ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 3 Jul 2024 16:48:51 +0800 Subject: [PATCH 5/8] setUnifiedSocialCreditCode --- .../src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java | 3 +++ 1 file changed, 3 insertions(+) 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 318950fd0..a88b32c05 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 @@ -100,6 +100,8 @@ public class PartnerBaseInfoVO { @ApiModelProperty("大区regionId") private Long bigRegionId; + private String unifiedSocialCreditCode; + @@ -118,6 +120,7 @@ public class PartnerBaseInfoVO { partnerBaseInfoVO.setSettlementCardPic(qualificationsInfoDO.getSettlementCardPic()); partnerBaseInfoVO.setSettlementOpeningBank(qualificationsInfoDO.getSettlementOpeningBank()); partnerBaseInfoVO.setEntrepreneurialExperience(qualificationsInfoDO.getEntrepreneurialExperience()); + partnerBaseInfoVO.setUnifiedSocialCreditCode(qualificationsInfoDO.getUnifiedSocialCreditCode()); partnerBaseInfoVO.setPreviouslyEngagedIndustries(qualificationsInfoDO.getPreviouslyEngagedIndustries()); partnerBaseInfoVO.setBankStatementsPic(qualificationsInfoDO.getBankStatementsPic()); partnerBaseInfoVO.setOldBrands(qualificationsInfoDO.getOldBrands()); From 4516623873064069deea11ae419f1c9c93c37311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 3 Jul 2024 18:26:42 +0800 Subject: [PATCH 6/8] getRemark --- .../java/com/cool/store/request/DecorationDesignRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java index 6783be0ff..1860a770f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java @@ -57,7 +57,7 @@ public class DecorationDesignRequest { threeAcceptanceDTO.setAcceptanceTime(new Date()); threeAcceptanceDTO.setStatus(CommonConstants.ONE); threeAcceptanceDTO.setResult(CommonConstants.ONE); - threeAcceptanceDTO.setRemark("加盟商确认设计方案通过"); + threeAcceptanceDTO.setRemark(threeAcceptanceDTO.getRemark() == null ? "" : threeAcceptanceDTO.getRemark()); decorationDesignInfoDO.setPartnerAcceptanceSignatures(JSONObject.toJSONString(threeAcceptanceDTO)); } decorationDesignInfoDO.setUpdateTime(new Date()); From eb81ec0da0090de2b5bf2f10c45d6bbf000b091c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 4 Jul 2024 14:02:45 +0800 Subject: [PATCH 7/8] user --- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 35d28ef7a..08985afed 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 @@ -337,7 +337,7 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_8, + return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_8, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus()), Constants.ZERO_INTEGER); } @@ -365,7 +365,7 @@ public class DeskServiceImpl implements DeskService { PageHelper.startPage(pageNum, pageSize); //user.getJobNumber() List specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), - subStageStatusList, user.getUserId()); + subStageStatusList, user==null?null:user.getUserId()); PageInfo result = new PageInfo<>(specialShopStageInfo); List shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); From 17f75658b7637b93ffb8cd8d7a092cab9e32f0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 4 Jul 2024 15:49:18 +0800 Subject: [PATCH 8/8] setBigRegion --- .../cool/store/service/impl/ApplyLicenseServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 2995345b3..42f5f1eb8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -273,10 +273,8 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { RegionDO regionDO = regionMapper.getBigRegionByRegionId(vo.getFightRegionId()); Long bigRegionIdByAreaId = regionDO.getId(); Map regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, vo.getFightRegionId())); - vo.setFightRegionId(vo.getFightRegionId()); - vo.setFightRegion(regionNameMap.get(vo.getFightRegionId())); - vo.setBigRegionId(bigRegionIdByAreaId); - vo.setBigRegion(regionNameMap.get(bigRegionIdByAreaId)); + vo.setBigRegionId(vo.getFightRegionId()); + vo.setBigRegion(regionNameMap.get(vo.getFightRegionId())); } } }