suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250513_franchise_report

Browse Source
This commit is contained in:
shuo.wang
2025-05-15 16:30:12 +08:00
parent f253b2a0c3 c3d2ec4832
commit 369f93b1a2
3 changed files with 71 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
View File

@@ -20,16 +20,16 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_12(ShopSubStageEnum.SHOP_STAGE_1, 120, "已选址", Boolean.TRUE),
//上传租赁合同
SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_2, 200, "待上传", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_2, 200, "待加盟商上传", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待督导审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_22(ShopSubStageEnum.SHOP_STAGE_2, 220, "审核未通过", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE),
//营业执照办理
SHOP_SUB_STAGE_STATUS_30(ShopSubStageEnum.SHOP_STAGE_3, 300, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_30(ShopSubStageEnum.SHOP_STAGE_3, 300, "待加盟商提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_33(ShopSubStageEnum.SHOP_STAGE_3, 330, "已完成", Boolean.TRUE),
//食安许可证
SHOP_SUB_STAGE_STATUS_40(ShopSubStageEnum.SHOP_STAGE_4, 400, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_40(ShopSubStageEnum.SHOP_STAGE_4, 400, "待加盟商提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_43(ShopSubStageEnum.SHOP_STAGE_4, 430, "已完成", Boolean.TRUE),
//培训登记
@@ -37,15 +37,15 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_51(ShopSubStageEnum.SHOP_STAGE_5, 510, "已完成", Boolean.TRUE),
//缴纳加盟费/保证金
SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待发布账单", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待缴费", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "待审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待内勤发布账单", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待加盟商缴费", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "待内勤审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_73(ShopSubStageEnum.SHOP_STAGE_7, 730, "已缴费", Boolean.TRUE),
SHOP_SUB_STAGE_STATUS_74(ShopSubStageEnum.SHOP_STAGE_7, 740, "审核不通过", Boolean.FALSE),
//加盟合同签约
SHOP_SUB_STAGE_STATUS_80(ShopSubStageEnum.SHOP_STAGE_8, 800, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_83(ShopSubStageEnum.SHOP_STAGE_8, 830, "审核中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_80(ShopSubStageEnum.SHOP_STAGE_8, 800, "待加盟内勤/大区内勤提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_83(ShopSubStageEnum.SHOP_STAGE_8, 830, "待分部内勤审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_84(ShopSubStageEnum.SHOP_STAGE_8, 840, "已签约", Boolean.TRUE),
SHOP_SUB_STAGE_STATUS_85(ShopSubStageEnum.SHOP_STAGE_8, 850, "审核失败", Boolean.FALSE),
@@ -54,14 +54,14 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_85_3(ShopSubStageEnum.SHOP_STAGE_8_5, 890, "已完成", Boolean.TRUE),
//测量阶段
SHOP_SUB_STAGE_STATUS_861(ShopSubStageEnum.SHOP_STAGE_8_6, 891, "待分配", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_862(ShopSubStageEnum.SHOP_STAGE_8_6, 892, "测量中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_861(ShopSubStageEnum.SHOP_STAGE_8_6, 891, "待立规内勤分配", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_862(ShopSubStageEnum.SHOP_STAGE_8_6, 892, "待测量员上传测量图", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_863(ShopSubStageEnum.SHOP_STAGE_8_6, 893, "测量完成", Boolean.TRUE),
//设计阶段
SHOP_SUB_STAGE_STATUS_90(ShopSubStageEnum.SHOP_STAGE_9, 900, "待分配设计师", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_901(ShopSubStageEnum.SHOP_STAGE_9, 901, "设计中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_902(ShopSubStageEnum.SHOP_STAGE_9, 902, "待分配报价员", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_903(ShopSubStageEnum.SHOP_STAGE_9, 903, "待报价", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_90(ShopSubStageEnum.SHOP_STAGE_9, 900, "待设计组长分配设计师", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_901(ShopSubStageEnum.SHOP_STAGE_9, 901, "待设计师上传设计图", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_902(ShopSubStageEnum.SHOP_STAGE_9, 902, "待报价员领取", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_903(ShopSubStageEnum.SHOP_STAGE_9, 903, "待报价员上传报价单", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_905(ShopSubStageEnum.SHOP_STAGE_9, 905, "待确认", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_91(ShopSubStageEnum.SHOP_STAGE_9, 910, "已完成", Boolean.TRUE),
@@ -82,61 +82,61 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_143(ShopSubStageEnum.SHOP_STAGE_14, 1440, "已完成", Boolean.TRUE),
//平台资料提交
SHOP_SUB_STAGE_STATUS_150(ShopSubStageEnum.SHOP_STAGE_15, 1500, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "待总部填写仓配信息", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_152(ShopSubStageEnum.SHOP_STAGE_15, 1520, "待总部提交订货收款信息",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_150(ShopSubStageEnum.SHOP_STAGE_15, 1500, "待加盟商提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "待圆规物流填写", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_152(ShopSubStageEnum.SHOP_STAGE_15, 1520, "待财务填写",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_153(ShopSubStageEnum.SHOP_STAGE_15, 1530, "待分部总监审批",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_154(ShopSubStageEnum.SHOP_STAGE_15, 1540, "待分管副总裁审批",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_155(ShopSubStageEnum.SHOP_STAGE_15, 1550, "待总裁审批",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_156(ShopSubStageEnum.SHOP_STAGE_15, 1560, "已完成", Boolean.TRUE),
//POS
SHOP_SUB_STAGE_STATUS_160(ShopSubStageEnum.SHOP_STAGE_16, 1600, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_160(ShopSubStageEnum.SHOP_STAGE_16, 1600, "待【火码】提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_163(ShopSubStageEnum.SHOP_STAGE_16, 1630, "已完成", Boolean.TRUE),
//订货系统
SHOP_SUB_STAGE_STATUS_170(ShopSubStageEnum.SHOP_STAGE_17, 1700, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_170(ShopSubStageEnum.SHOP_STAGE_17, 1700, "待【信息部】提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_173(ShopSubStageEnum.SHOP_STAGE_17, 1730, "已完成", Boolean.TRUE),
//抖音
SHOP_SUB_STAGE_STATUS_180(ShopSubStageEnum.SHOP_STAGE_18, 1800, "待申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_181(ShopSubStageEnum.SHOP_STAGE_18, 1810, "受理中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_180(ShopSubStageEnum.SHOP_STAGE_18, 1800, "待加盟商申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_181(ShopSubStageEnum.SHOP_STAGE_18, 1810, "待【豆码】开通", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_182(ShopSubStageEnum.SHOP_STAGE_18, 1820,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_183(ShopSubStageEnum.SHOP_STAGE_18, 1830, "开通成功", Boolean.TRUE),
//美团外卖
SHOP_SUB_STAGE_STATUS_190(ShopSubStageEnum.SHOP_STAGE_19, 1900, "待申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_190(ShopSubStageEnum.SHOP_STAGE_19, 1900, "待加盟商申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_191(ShopSubStageEnum.SHOP_STAGE_19, 1910, "初审中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_193(ShopSubStageEnum.SHOP_STAGE_19, 1930,"受理中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_193(ShopSubStageEnum.SHOP_STAGE_19, 1930,"待【火码】开通", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_194(ShopSubStageEnum.SHOP_STAGE_19, 1940,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_195(ShopSubStageEnum.SHOP_STAGE_19, 1950, "开通成功", Boolean.TRUE),
//美团团购
SHOP_SUB_STAGE_STATUS_200(ShopSubStageEnum.SHOP_STAGE_20, 2000, "待申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_201(ShopSubStageEnum.SHOP_STAGE_20, 2010, "受理中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_200(ShopSubStageEnum.SHOP_STAGE_20, 2000, "待加盟商申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_201(ShopSubStageEnum.SHOP_STAGE_20, 2010, "待【火码】开通", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_202(ShopSubStageEnum.SHOP_STAGE_20, 2020,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_203(ShopSubStageEnum.SHOP_STAGE_20, 2030, "开通成功", Boolean.TRUE),
//饿了么
SHOP_SUB_STAGE_STATUS_210(ShopSubStageEnum.SHOP_STAGE_21, 2100, "待申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_210(ShopSubStageEnum.SHOP_STAGE_21, 2100, "待加盟商申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_211(ShopSubStageEnum.SHOP_STAGE_21, 2110, "初审中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_213(ShopSubStageEnum.SHOP_STAGE_21, 2130,"受理中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_213(ShopSubStageEnum.SHOP_STAGE_21, 2130,"待【火码】开通", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_214(ShopSubStageEnum.SHOP_STAGE_21, 2140,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_215(ShopSubStageEnum.SHOP_STAGE_21, 2150, "开通成功", Boolean.TRUE),
//快手
SHOP_SUB_STAGE_STATUS_220(ShopSubStageEnum.SHOP_STAGE_22, 2200, "待申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_221(ShopSubStageEnum.SHOP_STAGE_22, 2210, "受理中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_220(ShopSubStageEnum.SHOP_STAGE_22, 2200, "待加盟商申请", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_221(ShopSubStageEnum.SHOP_STAGE_22, 2210, "待【豆码】开通", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_222(ShopSubStageEnum.SHOP_STAGE_22, 2220,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_223(ShopSubStageEnum.SHOP_STAGE_22, 2230, "开通成功", Boolean.TRUE),
//信发系统开通
SHOP_SUB_STAGE_STATUS_230(ShopSubStageEnum.SHOP_STAGE_23, 2300, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_230(ShopSubStageEnum.SHOP_STAGE_23, 2300, "待【信息部】提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_235(ShopSubStageEnum.SHOP_STAGE_23, 2350, "已完成", Boolean.TRUE),
//营帐通开通
SHOP_SUB_STAGE_STATUS_240(ShopSubStageEnum.SHOP_STAGE_24, 2400, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_240(ShopSubStageEnum.SHOP_STAGE_24, 2400, "待【信息部】提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_244(ShopSubStageEnum.SHOP_STAGE_24, 2440, "无需开通", Boolean.TRUE),
SHOP_SUB_STAGE_STATUS_245(ShopSubStageEnum.SHOP_STAGE_24, 2450, "已完成", Boolean.TRUE),

11
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -612,13 +612,12 @@ public class DecorationServiceImpl implements DecorationService {
if (decoration == null) {
//查询测量阶段的设计组长
DecorationMeasureDO measureDO = decorationMeasureDAO.getByShopId(shopId);
if (measureDO == null) {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
}
DecorationDesignVO decorationDesignVO = new DecorationDesignVO();
decorationDesignVO.setDesignLeaderId(measureDO.getDesignUserId());
String userName = enterpriseUserDAO.getUserName(measureDO.getDesignUserId().toString());
decorationDesignVO.setDesignLeaderName(userName);
if (measureDO!=null){
decorationDesignVO.setDesignLeaderId(measureDO.getDesignUserId());
String userName = enterpriseUserDAO.getUserName(measureDO.getDesignUserId());
decorationDesignVO.setDesignLeaderName(userName);
}
return decorationDesignVO;
}
DecorationDesignVO decorationDesignVO = BeanUtil.toBean(decoration, DecorationDesignVO.class);

52
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -37,6 +37,7 @@ import java.util.*;
import java.util.stream.Collectors;
import static com.cool.store.enums.UserRoleEnum.*;
import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
@Service
@Slf4j
@@ -116,7 +117,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
Long shopId = getShopId(request.getKdzBusinessId());
ShopSubStageStatusEnum shopSubStageStatusEnum = null;
if (request.getAuditResult() == 1) {
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84;
shopSubStageStatusEnum = SHOP_SUB_STAGE_STATUS_84;
} else if (request.getAuditResult() == 0) {
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85;
}
@@ -331,7 +332,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
Long shopId = request.getShopId();
ShopSubStageStatusEnum shopSubStageStatusEnum = null;
if (request.getAuditResult() == 1) {
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84;
shopSubStageStatusEnum = SHOP_SUB_STAGE_STATUS_84;
} else if (request.getAuditResult() == 0) {
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85;
}
@@ -377,23 +378,38 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopStageInfoDAO.updateShopStageInfo(shopId, shopSubStageStatusEnum);
//初始化数据
preparationService.contractAndBuildStoreCompletion(request.getShopId());
commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT);
HashMap<String, String> map = new HashMap<>();
map.put("partnerUsername", lineInfoDO.getUsername());
map.put("partnerMobile", lineInfoDO.getMobile());
map.put("storeName", shopInfoDO.getShopName());
List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
List<String> finances = new ArrayList<>();
if (Objects.nonNull(userDOList)) {
finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
//判断是否是老店新开
SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
log.info("加盟合同审批时签约类型:{}",SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
Boolean sendNotice = Boolean.TRUE;
if (SignTypeEnum.OLD_NEW_OPEN.getCode().equals(signFranchiseDO.getSignType())){
//老店新开时装修与开业直接完成
shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId),Arrays.asList(
SHOP_SUB_STAGE_STATUS_863,SHOP_SUB_STAGE_STATUS_91,SHOP_SUB_STAGE_STATUS_112,SHOP_SUB_STAGE_STATUS_123,SHOP_SUB_STAGE_STATUS_143
));
//老店新开 不需要装修与开业 无需发送通知
sendNotice = Boolean.FALSE;
}
commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT);
if (sendNotice){
HashMap<String, String> map = new HashMap<>();
map.put("partnerUsername", lineInfoDO.getUsername());
map.put("partnerMobile", lineInfoDO.getMobile());
map.put("storeName", shopInfoDO.getShopName());
List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
List<String> finances = new ArrayList<>();
if (Objects.nonNull(userDOList)) {
finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
}
List<String> liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode()));
commonService.sendQWMessage(liGuiNeiQinList,
MessageEnum.MESSAGE_57,
map);
commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()),
MessageEnum.MESSAGE_26,
map);
}
List<String> liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode()));
commonService.sendQWMessage(liGuiNeiQinList,
MessageEnum.MESSAGE_57,
map);
commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()),
MessageEnum.MESSAGE_26,
map);
}
shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
Long auditId = shopAuditInfoDO.getId();