diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index a25affca8..e4db49b8a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -68,7 +68,13 @@ public enum MessageEnum { MESSAGE_40("您有一个门店信发系统信息待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_41("您有一个门店营帐通信息待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_42("您有一个门店开业运营方案待审核，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), - + MESSAGE_43("您有一个门店已提交抖音建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_44("您有一个门店已提交美团外卖建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_45("您有一个门店已提交美团团购建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_46("您有一个门店已提交饿了么建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_47("您有一个门店已提交快手建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_48("您有一个门店饿了么初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_49("您有一个门店美团外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; 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 9f19c72b2..904ca116d 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 @@ -43,8 +43,13 @@ public enum UserRoleEnum { TENT_PASS_CUSTOMER(380000000L,"营帐通客服"), DESIGN_CUSTOMER(390000000L,"设计客服"), CONSTRUCTION_CUSTOMER(400000000L,"施工客服"), - BRANCH_OFFICE(1724233283449L,"分布内勤"), + BRANCH_OFFICE(1724233283449L,"分部内勤"), + JOIN_OFFICE(1719278230274L,"加盟内勤"), + REGION_OFFICE(1725431635706L,"大区内勤"), FINANCE(1735895867344L,"财务"), + CHUAN_XIAO_MEI_MANAGER(1731635078802L,"串小妹大区执行总经理"), + REGIONAL_MANAGER(1716252923436L,"大区经理"), + ; private Long code; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 0aa530ca8..9f19a387a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -117,9 +117,6 @@ public class BuildInformationServiceImpl implements BuildInformationService{ commonService.sendQWMessage(itUsers, MessageEnum.MESSAGE_39, map); - commonService.sendQWMessage(itUsers, - MessageEnum.MESSAGE_40, - map); List posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId()); List posUsers = posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); commonService.sendQWMessage(posUsers, @@ -130,6 +127,11 @@ public class BuildInformationServiceImpl implements BuildInformationService{ commonService.sendQWMessage(xfUsers, MessageEnum.MESSAGE_40, map); + List zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId()); + List zxtUsers = xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(zxtUsers, + MessageEnum.MESSAGE_41, + map); return buildInformationDAO.insertSelective(buildInformationDO); }else { buildInformationDO.setUpdateTime(new Date()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 67b9c669f..ef4753d45 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; -import com.cool.store.enums.AuditTypeEnum; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.MessageEnum; -import com.cool.store.enums.SMSMsgEnum; +import com.cool.store.enums.*; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.*; @@ -15,6 +12,7 @@ import com.cool.store.request.AuditFranchiseFeeRequest; import com.cool.store.request.FranchiseFeeRequest; import com.cool.store.response.FranchiseFeeResponse; import com.cool.store.service.FranchiseFeeService; +import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.poi.constant.Constants; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigInteger; import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -48,6 +47,8 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Resource CommonService commonService; + @Resource + UserAuthMappingService userAuthMappingService; @Override @Transactional(rollbackFor = Exception.class) @@ -126,11 +127,22 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_80); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + Set franchiseContractUser = new HashSet<>(); + List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, shopInfoDO.getRegionId()); + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!joinUserIds.isEmpty()) { + franchiseContractUser.addAll(joinUserIds); + } + List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionUserIds.isEmpty()) { + franchiseContractUser.addAll(regionUserIds); + } HashMap map = new HashMap<>(); map.put("partnerUsername",lineInfo.getUsername()); map.put("partnerMobile",lineInfo.getMobile()); map.put("storeName",shopInfoDO.getShopName()); - commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), + commonService.sendQWMessage(new ArrayList<>(franchiseContractUser), MessageEnum.MESSAGE_19, map); } else if (Constants.ONE_INTEGER.equals(request.getStatus())) { 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 d23b53c94..d50666081 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 @@ -158,14 +158,29 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70)); List shopListByIds = shopInfoDAO.getShopListByIds(shopIds); + Set regionIds = shopListByIds.stream().map(ShopInfoDO::getRegionId).collect(Collectors.toSet()); Set userSet = shopListByIds.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); + SetpublishFranchiseFeeUsers = new HashSet<>(); + for (Long regionId : regionIds){ + List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, regionId); + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!joinUserIds.isEmpty()){ + publishFranchiseFeeUsers.addAll(joinUserIds); + } + List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, regionId); + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionUserIds.isEmpty()){ + publishFranchiseFeeUsers.addAll(regionUserIds); + } + } + HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfo.getUsername()); map.put("partnerMobile", lineInfo.getMobile()); commonService.sendQWMessage(new ArrayList<>(userSet), MessageEnum.MESSAGE_14, map); - commonService.sendQWMessage(new ArrayList<>(userSet), + commonService.sendQWMessage(new ArrayList<>(publishFranchiseFeeUsers), MessageEnum.MESSAGE_23, map); commonService.sendQWMessage(new ArrayList<>(userSet), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index e3922a959..0a3e9f6af 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -21,6 +21,7 @@ import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.service.LinePayService; +import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.StringUtils; @@ -38,6 +39,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.text.MessageFormat; import java.util.*; +import java.util.stream.Collectors; /** * @Author wxp @@ -69,6 +71,8 @@ public class LinePayServiceImpl implements LinePayService { ShopInfoMapper shopInfoMapper; @Autowired private RedisUtilPool redisUtilPool; + @Resource + private UserAuthMappingService userAuthMappingService; @Override public LinePayVO getLinePayInfo(Long lineId, Integer businessType, Long shopId) { @@ -151,11 +155,22 @@ public class LinePayServiceImpl implements LinePayService { franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(franchiseFeeDO.getShopId()); + Set auditFranchiseFeeUsers = new HashSet<>(); + List branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.BRANCH_OFFICE, shopInfoDO.getRegionId()); + Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!branchUserIds.isEmpty()) { + auditFranchiseFeeUsers.addAll(branchUserIds); + } + List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionUserIds.isEmpty()) { + auditFranchiseFeeUsers.addAll(regionUserIds); + } HashMap map = new HashMap<>(); map.put("partnerUsername",lineInfo.getUsername()); map.put("partnerMobile",lineInfo.getMobile()); map.put("storeName",shopInfoDO.getShopName()); - commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), + commonService.sendQWMessage(new ArrayList<>(auditFranchiseFeeUsers), MessageEnum.MESSAGE_18, map); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index d14b2d566..09c2e1b9e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -105,12 +105,23 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_141); ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); + Set planAuditUser = new HashSet<>(); + List regionManagerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfoDO.getRegionId()); + Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionManagerUserIds.isEmpty()) { + planAuditUser.addAll(regionManagerUserIds); + } + List regionalManager = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGIONAL_MANAGER, shopInfoDO.getRegionId()); + Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionalManagerUserIds.isEmpty()) { + planAuditUser.addAll(regionalManagerUserIds); + } HashMap map = new HashMap<>(); map.put("partnerUsername",lineInfoDO.getUsername()); map.put("partnerMobile",lineInfoDO.getMobile()); map.put("storeName",shopInfoDO.getShopName()); - commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), - MessageEnum.MESSAGE_38, + commonService.sendQWMessage(new ArrayList<>(planAuditUser), + MessageEnum.MESSAGE_42, map); return planId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index cf792ff97..093fbda1b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -78,7 +78,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { private PointInfoDAO pointInfoDAO; @Autowired private RegionMapper regionMapper; - + @Resource + private CommonService commonService; @Override public String juridicalIdCard(Long shopId) { BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId); @@ -97,6 +98,11 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { PlatformBuildDO platformBuild = request.toDO(); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); Long regionId = shopInfo.getRegionId(); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + HashMap map = new HashMap<>(); + map.put("partnerUsername",lineInfoDO.getUsername()); + map.put("partnerMobile",lineInfoDO.getMobile()); + map.put("storeName",shopInfo.getShopName()); //抖音 if (type.equals(PlatformBuildEnum.DOU_YIN.getCode())) { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_18); @@ -104,12 +110,17 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { && !shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_182.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } + List dyCustomerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId); + List dyCustomerUserIds = dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(dyCustomerUserIds, + MessageEnum.MESSAGE_43, + map); if (Objects.isNull(platformBuildDO)) { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_180, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId)); + dyCustomerUser); } else { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_182, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId)); + dyCustomerUser); return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuild); } } @@ -120,12 +131,17 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { && !shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_222.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } + List ksUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId); + List ksUserIds = ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(ksUserIds, + MessageEnum.MESSAGE_47, + map); if (Objects.isNull(platformBuildDO)) { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_220, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId)); + ksUser); } else { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_222, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId)); + ksUser); return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuild); } } @@ -136,12 +152,17 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { && !shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_202.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } + List mtbcUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId); + List mtbcUserIds = mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(mtbcUserIds, + MessageEnum.MESSAGE_45, + map); if (Objects.isNull(platformBuildDO)) { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_200, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId)); + mtbcUser); } else { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_202, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId)); + mtbcUser); return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuild); } } @@ -152,12 +173,17 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { && !shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } + List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId); + List elmUserIds = elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(elmUserIds, + MessageEnum.MESSAGE_46, + map); if (Objects.isNull(platformBuildDO)) { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_210, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId)); + elmUser); } else { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId)); + elmUser); return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuild); } } @@ -168,12 +194,17 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { && !shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } + List mtocUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId); + List mtocUserIds = mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(mtocUserIds, + MessageEnum.MESSAGE_44, + map); if (Objects.isNull(platformBuildDO)) { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_190, SHOP_SUB_STAGE_STATUS_191, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId)); + mtocUser); } else { extracted(partnerUserInfoVO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191, - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId)); + mtocUser); return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuild); } } @@ -329,7 +360,12 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { Long shopId = request.getShopId(); PlatformBuildDO platformBuildDO = platformBuildDAO.selectOneByShopId(shopId, type); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); - Long regionId = shopInfo.getRegionId(); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + Long regionId = shopInfo.getRegionId(); + HashMap map = new HashMap<>(); + map.put("partnerUsername",lineInfoDO.getUsername()); + map.put("partnerMobile",lineInfoDO.getMobile()); + map.put("storeName",shopInfo.getShopName()); if (type.equals(PlatformBuildEnum.DOU_YIN.getCode())) { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_18); if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus())) { @@ -365,8 +401,13 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.E_LE_ME); doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); + List elmUserIds = elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId), OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); + elmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); + commonService.sendQWMessage(elmUserIds, + MessageEnum.MESSAGE_48, + map); } return CommonConstants.ONE; } @@ -379,8 +420,13 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_WAI_MAI); doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_191, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); + List mtwmUserIds = mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + commonService.sendQWMessage(mtwmUserIds, + MessageEnum.MESSAGE_49, + map); operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_193, request.getOperateUserId(), - userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId), OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); + mtwmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); } return CommonConstants.ONE; } 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 54f9e25bf..c9870ea3f 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 @@ -117,15 +117,25 @@ public class ShopServiceImpl implements ShopService { } shopInfoDAO.batchAddShop(addShopList); List shopIds = addShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); - Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds,true); - + Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds, true); + Set publishFranchiseFeeUsers = new HashSet<>(); + List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!joinUserIds.isEmpty()) { + publishFranchiseFeeUsers.addAll(joinUserIds); + } + List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionUserIds.isEmpty()) { + publishFranchiseFeeUsers.addAll(regionUserIds); + } HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfo.getUsername()); - map.put("partnerMobile",lineInfo.getMobile()); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_14, map); - commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), + commonService.sendQWMessage(new ArrayList<>(publishFranchiseFeeUsers), MessageEnum.MESSAGE_23, map); commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), @@ -268,13 +278,13 @@ public class ShopServiceImpl implements ShopService { } ShopInfoDO shopInfoDO = request.toDO(request, lineInfo); List shopList = shopInfoDAO.getShopList(lineInfo.getId()); - if(StringUtils.isBlank(request.getShopName())){ + if (StringUtils.isBlank(request.getShopName())) { if (CollectionUtils.isNotEmpty(shopList)) { - shopInfoDO.setShopName("店铺"+NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum() + 1)); - }else{ - shopInfoDO.setShopName("店铺"+NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum())); + shopInfoDO.setShopName("店铺" + NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum() + 1)); + } else { + shopInfoDO.setShopName("店铺" + NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum())); } - }else{ + } else { shopInfoDO.setShopName(request.getShopName()); } @@ -287,12 +297,23 @@ public class ShopServiceImpl implements ShopService { if (lineInfo.getWorkflowSubStageStatus().equals(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode())) { shopStageInfoDAO.initShopStageInfo(request.getLineId(), Collections.singletonList(shopId), true); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfo.getUsername()); - map.put("partnerMobile",lineInfo.getMobile()); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + Set publishFranchiseFeeUsers = new HashSet<>(); + List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, request.getRegionId()); + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!joinUserIds.isEmpty()) { + publishFranchiseFeeUsers.addAll(joinUserIds); + } + List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, request.getRegionId()); + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + if (!regionUserIds.isEmpty()) { + publishFranchiseFeeUsers.addAll(regionUserIds); + } commonService.sendQWMessage(Collections.singletonList(request.getInvestmentManagerUserId()), MessageEnum.MESSAGE_14, map); - commonService.sendQWMessage(Collections.singletonList(request.getInvestmentManagerUserId()), + commonService.sendQWMessage(new ArrayList<>(publishFranchiseFeeUsers), MessageEnum.MESSAGE_23, map); commonService.sendQWMessage(Collections.singletonList(request.getInvestmentManagerUserId()), @@ -413,7 +434,7 @@ public class ShopServiceImpl implements ShopService { } PageHelper.startPage(request.getPageNum(), request.getPageSize()); List responses = new ArrayList<>(); - List preparations = shopInfoDAO.ListByBranchShopRequest(request,userId); + List preparations = shopInfoDAO.ListByBranchShopRequest(request, userId); PageInfo pageInfo = new PageInfo<>(preparations); if (CollectionUtils.isEmpty(preparations)) { return new PageInfo<>();