From e97c147facf31a0cb55d3ce4651e2d5d73e655b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <570057076@qq.com> Date: Thu, 25 Dec 2025 10:50:38 +0000 Subject: [PATCH] Merge #17 into master from cc_20251218_opening MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'master' into cc_20251218_opening * cc_20251218_opening: (11 commits squashed) - fix:信发查询bug - fix:信发查询bug - fix:测试 - fix:老店新开不需要开业验收 - feat:开业验收数据处理 - fix:开业验收bug修复 - fix:开业验收bug修复 - fix:云流水权限开通 - feat:开业验收数据处理 - feat:开业验收数据处理 - Merge branch 'master' into cc_20251218_opening Signed-off-by: 苏竹红 <570057076@qq.com> Merged-by: 苏竹红 <570057076@qq.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17 --- .../com/cool/store/enums/AuditTypeEnum.java | 1 + .../com/cool/store/enums/UserRoleEnum.java | 2 + .../enums/opening/AcceptanceStatusEnum.java | 41 +++++ .../store/enums/point/ShopSubStageEnum.java | 6 +- .../enums/point/ShopSubStageStatusEnum.java | 8 + .../store/dao/OpeningAcceptanceMapperDAO.java | 35 ++++ .../store/mapper/OpeningAcceptanceMapper.java | 16 ++ .../mapper/OpeningAcceptanceMapper.xml | 25 +++ .../main/resources/mapper/ShopInfoMapper.xml | 1 + .../store/entity/OpeningAcceptanceDO.java | 85 ++++++++++ .../store/request/AuditApproveRequest.java | 2 +- .../opening/OpeningAcceptanceRequest.java | 64 ++++++++ .../vo/opening/OpeningAcceptanceDetailVO.java | 68 ++++++++ .../cool/store/service/DataHandlerServer.java | 7 + .../com/cool/store/service/DeskService.java | 6 + .../store/service/PosAndOrderInfoService.java | 7 + .../service/impl/DataHandlerServerImpl.java | 53 ++++++ .../impl/DecorationDesignInfoServiceImpl.java | 2 +- .../service/impl/DecorationServiceImpl.java | 2 +- .../store/service/impl/DeskServiceImpl.java | 25 ++- .../impl/PosAndOrderInfoServiceImpl.java | 16 +- .../store/service/impl/ShopServiceImpl.java | 8 +- .../impl/SignFranchiseServiceImpl.java | 3 +- .../impl/TempUserDetailServiceImpl.java | 17 +- .../opening/OpeningAcceptanceService.java | 42 +++++ .../impl/OpeningAcceptanceServiceImpl.java | 154 ++++++++++++++++++ .../store/controller/webb/DeskController.java | 10 ++ .../webb/OpeningAcceptanceController.java | 71 ++++++++ .../controller/webb/PCOrderSysController.java | 6 + .../controller/webb/PCTestController.java | 12 ++ .../webc/MiniOpeningAcceptanceController.java | 42 +++++ 31 files changed, 824 insertions(+), 13 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/opening/AcceptanceStatusEnum.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/OpeningAcceptanceMapperDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpeningAcceptanceMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/OpeningAcceptanceMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/OpeningAcceptanceDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/opening/OpeningAcceptanceRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/opening/OpeningAcceptanceDetailVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/opening/OpeningAcceptanceService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/opening/impl/OpeningAcceptanceServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpeningAcceptanceController.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpeningAcceptanceController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java index 62da8252f..07bf20308 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java @@ -18,6 +18,7 @@ public enum AuditTypeEnum { YING_ZHANG_TONG(14,"营帐通"), BUILDINFORMATION(15,"建店资料信息"), JINg_DONG_WAI_MAI(16,"京东外卖"), + OPENING_ACCEPTANCE(17,"开业验收"), ; private Integer code; 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 400fd85b7..b713c827c 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 @@ -71,6 +71,8 @@ public enum UserRoleEnum { JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"), FRANCHISEES(530000000L,"加盟商"), SERVICE_PACKAGE_DEDICATED(1762761165005L,"服务包专用"), + OPERATION_GENERAL_CONSULTANT(1764642515446L,"运营片区总顾问"), + ORDER_GROUP(1766387359609L,"订单组"), ; private Long code; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/opening/AcceptanceStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/opening/AcceptanceStatusEnum.java new file mode 100644 index 000000000..c07105aa2 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/opening/AcceptanceStatusEnum.java @@ -0,0 +1,41 @@ +package com.cool.store.enums.opening; + +/** + * @Auther zx_szh + * @Date 2025/12/22 10:29 + * @Version 1.0 + */ +public enum AcceptanceStatusEnum { + + PENDING_ACCEPTANCE(1,"待验收"), + ACCEPTANCE_IS_UNQUALIFIED(5,"验收不合格"), + ACCEPTED(10,"已验收"), + + ; + + AcceptanceStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java index 772f87c11..fa2112b1e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java @@ -18,7 +18,6 @@ public enum ShopSubStageEnum { SHOP_STAGE_3(ShopStageEnum.SHOP_STAGE_2, 30, "营业执照办理", 23), SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "食安许可证", 55), SHOP_STAGE_5(ShopStageEnum.SHOP_STAGE_2, 50, "员工招聘", 23), - SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 260, "开通门店平安钱包", 1), SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 1), SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 4), SHOP_STAGE_8_5(ShopStageEnum.SHOP_STAGE_2, 85, "发票回传", 5), @@ -42,6 +41,10 @@ public enum ShopSubStageEnum { SHOP_STAGE_22(ShopStageEnum.SHOP_STAGE_3, 220, "快手", null), SHOP_STAGE_25(ShopStageEnum.SHOP_STAGE_3, 250, "京东外卖", null), + SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 260, "开通门店平安钱包", 1), + SHOP_STAGE_27(ShopStageEnum.SHOP_STAGE_2, 270, "开业验收", 1), + + ; //阶段 @@ -136,6 +139,7 @@ public enum ShopSubStageEnum { case SHOP_STAGE_23: case SHOP_STAGE_24: case SHOP_STAGE_25: + case SHOP_STAGE_27: return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00; default: return null; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index 462f2d14a..7c3745e71 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -101,6 +101,8 @@ public enum ShopSubStageStatusEnum { //订货系统 SHOP_SUB_STAGE_STATUS_170(ShopSubStageEnum.SHOP_STAGE_17, 1700, "待【IT部】提交", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_171(ShopSubStageEnum.SHOP_STAGE_17, 1710, "等待培训中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_172(ShopSubStageEnum.SHOP_STAGE_17, 1720, "待授权账号", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_173(ShopSubStageEnum.SHOP_STAGE_17, 1730, "已完成", Boolean.TRUE), //抖音 @@ -153,6 +155,12 @@ public enum ShopSubStageStatusEnum { SHOP_SUB_STAGE_STATUS_254(ShopSubStageEnum.SHOP_STAGE_25, 2540,"开通失败", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_255(ShopSubStageEnum.SHOP_STAGE_25, 2550, "开通成功", Boolean.TRUE), + //开业验收 + SHOP_SUB_STAGE_STATUS_270(ShopSubStageEnum.SHOP_STAGE_27, 2700, "待上传", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_272(ShopSubStageEnum.SHOP_STAGE_27, 2720, "待审批", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_274(ShopSubStageEnum.SHOP_STAGE_27, 2740,"待整改", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_276(ShopSubStageEnum.SHOP_STAGE_27, 2760,"已完成", Boolean.TRUE), + ; private ShopSubStageEnum shopSubStageEnum; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OpeningAcceptanceMapperDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OpeningAcceptanceMapperDAO.java new file mode 100644 index 000000000..779797fbb --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OpeningAcceptanceMapperDAO.java @@ -0,0 +1,35 @@ +package com.cool.store.dao; + +import com.cool.store.entity.OpeningAcceptanceDO; +import com.cool.store.mapper.OpeningAcceptanceMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; + +@Slf4j +@Repository +public class OpeningAcceptanceMapperDAO { + + @Resource + private OpeningAcceptanceMapper openingAcceptanceMapper; + + public Integer addOpeningAcceptance(OpeningAcceptanceDO openingAcceptanceDO){ + return openingAcceptanceMapper.insert(openingAcceptanceDO); + } + + public Integer updateOpeningAcceptance(OpeningAcceptanceDO openingAcceptanceDO){ + return openingAcceptanceMapper.updateByPrimaryKeySelective(openingAcceptanceDO); + } + + public OpeningAcceptanceDO getOpeningAcceptanceByShopId(Long shopId){ + if (shopId == null){ + return null; + } + return openingAcceptanceMapper.getOpeningAcceptanceByShopId(shopId); + } + + + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpeningAcceptanceMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpeningAcceptanceMapper.java new file mode 100644 index 000000000..0d0e3f7a8 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpeningAcceptanceMapper.java @@ -0,0 +1,16 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.OpeningAcceptanceDO; +import org.apache.ibatis.annotations.Param; +import tk.mybatis.mapper.common.Mapper; + +/** + * @Auther suzhuhong + * @Date ${DATE} ${TIME} + * @Version 1.0 + */ +public interface OpeningAcceptanceMapper extends Mapper { + + OpeningAcceptanceDO getOpeningAcceptanceByShopId(@Param("shopId") Long shopId); + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpeningAcceptanceMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpeningAcceptanceMapper.xml new file mode 100644 index 000000000..be14a33c4 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningAcceptanceMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 9183d5312..40de4927b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -269,6 +269,7 @@ and id = #{shopId} + order by id desc