From 0a621146392dcb97cff53d3f354ca280071733cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 21 May 2026 09:39:32 +0000 Subject: [PATCH] Merge #147 into master from cc_20250922_closeStore_w MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 非AI店非正新鸡排不开通网商钱包 * cc_20250922_closeStore_w: (100 commits squashed) - fix:新增用户管辖门店列表接口 - fix:门店列表接口新增门店积分字段 - fix:查询问题修复；新增草稿状态 - fix:申请单审批补充审批人字段 - fix:修改门店积分限制0-12 - fix:积分流水接口修复；申请单查询接口添加日期筛选 - fix:redis报错修复 - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选 - fix:新管家关店原因字段补充 - fix:惩处单复议申请查询异常修复 - fix:小程序惩处单详情接口字段补充 - fix:查询字段补充 - fix - fix:转义 - fix - fix:新增撤销复议申请单接口 - fix:补充字段 - fix:补充字段 - fix:新增门店分数接口 - fix:申请单新增筛选条件 - fix:门店积分接口返回参数修改 - fix:小程序规则分页查询接口改为Post - fix:问题修复 - fix:十二分导入 - fix:导入状态部分失败改为失败 - fix:字段补充 - fix:异步下Excel导入图片临时文件被清理的问题 - fix:扣分申请导入图片路径修改并使用CDN - fix:导入图片上传oss文件类型修改为图片 - fix:批量审批 - fix:批量审批新增备注字段 - fix:字段补充 - Merge branch 'master' into cc_2021104_twelve_points # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java # coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java - fix:新增字段 - fix:字段补充 - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息 - fix:小程序退款信息列表修改 - fix:闭店审批允许管理员审批 - fix:字典项新增排序、编辑删除权限、关联字典项 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分值-扣分列表申请复议截止日期格式 - fix:去除appealEndDate格式校验 - Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2 - fix:阶段名称修改 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店 - fix:提交新管家字段取值逻辑修改 - Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points - fix:字典回显包含已删除字典项 - Merge branch 'master' into cc_2021104_twelve_points - Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points - fix:去除惩处单审批阶段；复议申请单证明图片非必填 - fix:复议拒绝后惩处单直接生效 - fix:扣分申请单证明图片改为非必填 - fix - fix:字段转义 - fix:惩处待处理包含带生效数据 - fix:字段转义 - fix:警告单金额和积分初始化为0 - fix - fix:小程序接口字段转义 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分审批记录展示待审批人 - fix - fix:惩处单复议申请逾期检查改为延时队列 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w - fix:闭店定时任务过滤闭店状态补充 - Merge branch 'refs/heads/master' into cc_2021104_twelve_points # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店材料新增字段 - fix - fix:小程序闭店材料详情新增字段 - fix:闭店流程流转校验除授权书外是否已邮寄 - fix:营帐通JWT生成 - fix:营帐通JWT改为post - fix:修改secret - fix:配置 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分流水导出；流水新增规则描述字段 - fix - fix:闭店新管家接口错误信息返回 - Merge branch 'master' into cc_20250922_closeStore_w - Merge branch 'cc_20260412_jwt_ge' into cc_20250922_closeStore_w - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店火码关闭账号不存在时忽略 - Merge branch 'cc_2021104_twelve_points' into cc_20250922_closeStore_w - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java # coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java # coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java - fix:闭店逻辑修改 - fix:闭店待办列表新增字段 - fix:计划闭店时间修改 - fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段 - fix:删除字段 - fix:字段名称修改 - fix:闭店中止新增审批记录 - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java # coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:非标准店且非正新鸡排不开启网商钱包流程 - fix:修复不强制开通网商钱包导致的租赁合同上传失败的问题 - fix:不存在钱包开通阶段的，上传租赁合同后开启下一阶段 - Merge branch 'master' into cc_20250922_closeStore_w Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/147 --- .../src/main/java/com/cool/store/dao/ShopStageInfoDAO.java | 6 ++++++ .../cool/store/service/impl/ApplyLicenseServiceImpl.java | 7 +++++-- .../java/com/cool/store/service/impl/PointServiceImpl.java | 7 ++++++- 3 files changed, 17 insertions(+), 3 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 32b726da5..5a3e07fa6 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 @@ -63,6 +63,12 @@ public class ShopStageInfoDAO { if (shopSubStageEnum.equals(ShopSubStageEnum.SHOP_STAGE_14)) { continue; } + if (!CommonConstants.INDEX_ONE.equals(shopInfoDO.getUseStandardStore()) + && !String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand()) + && ShopSubStageEnum.SHOP_STAGE_6.equals(shopSubStageEnum)) { + // 不是标准店且不是正新鸡排的情况下，不开启网商钱包开通阶段 + continue; + } ShopStageInfoDO shopStageInfo = new ShopStageInfoDO(); shopStageInfo.setLineId(lineInfoDO.getId()); shopStageInfo.setShopId(shopId); 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 119c63028..157d0ab78 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 @@ -116,9 +116,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); if (request.getLegalIsSamePartner()){ // 法人身份证信息和加盟商一致 - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfo.getLineId()); if ( ! lineInfoDO.getUsername().equals(request.getLicenseLegalPerson())){ throw new ServiceException(ErrorCodeEnum.LEGAL_PERSON_NAME_NOT_SAME); @@ -148,7 +148,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { preparationService.buildStoreAndDecorationComplete(request.getShopId()); preparationService.selectSiteAndBuildStoreComplete(request.getShopId()); } - addTagIfUploadLicense(request.getShopId()); + if (CommonConstants.INDEX_ONE.equals(shopInfo.getUseStandardStore()) + || String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfo.getFranchiseBrand())) { + addTagIfUploadLicense(request.getShopId()); + } return Boolean.TRUE; } 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 55130c1f6..988dca926 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 @@ -1337,8 +1337,13 @@ public class PointServiceImpl implements PointService { shopInfoDAO.updateShopInfo(updateShop); //如果是通过 将钱包阶段状态从未开始改为已开始 已开始的不需要处理 ShopStageInfoDO walletStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); - if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(walletStage.getShopSubStageStatus())) { + if (Objects.nonNull(walletStage) && ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(walletStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60); + } else { + ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70); + } } } shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);