Merge #99 into master from cc_20260408_close_up

feat:歇业管理 * cc_20260408_close_up: (18 commits squashed) - fix:歇业管理（部分） - fix:歇业管理（部分） - fix:审批逻辑修改；拒绝审批实现 - fix:恢复开业申请及审批 - fix:主流程补充 - fix:主流程补充 - fix:字段补充及逻辑修改 - fix:字段补充 - fix - fix:平台处理新增字段 - fix - Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up - fix:歇业营业发送短信 - fix:排序 - fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败 - fix:申请单详情接口新增品牌字段 - fix:新增列表筛选条件；审批单状态校验 - Merge branch 'master' into cc_20260408_close_up # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/99
2026-04-15 08:23:40 +00:00
parent 1b3ae71c3a
commit 19bce915ac
51 changed files with 2502 additions and 9 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseUpController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseUpController.java
@@ -0,0 +1,91 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.request.closeup.CloseUpAuditRequest;
+import com.cool.store.request.closeup.CloseUpPlatformHandleRequest;
+import com.cool.store.request.closeup.CloseUpQueryRequest;
+import com.cool.store.request.closeup.CloseUpTodoQueryRequest;
+import com.cool.store.response.AuditInfoResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.closeup.CloseUpService;
+import com.cool.store.vo.closeup.CloseUpApplyFormSimpleVO;
+import com.cool.store.vo.closeup.CloseUpApplyFormVO;
+import com.cool.store.vo.closeup.CloseUpPlatformVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 歇业管理 前端控制器
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/4/8
+ */
+@Api(tags = "歇业管理")
+@RestController
+@RequestMapping("/pc/closeup")
+@RequiredArgsConstructor
+@Validated
+public class CloseUpController {
+    private final CloseUpService closeUpService;
+
+    @ApiOperation("H5歇业开业待办")
+    @PostMapping("/todoList")
+    public ResponseResult<PageInfo<CloseUpApplyFormSimpleVO>> todoList(@RequestBody @Validated CloseUpTodoQueryRequest request) {
+        return ResponseResult.success(closeUpService.todoList(request));
+    }
+
+    @ApiOperation("开业歇业申请列表")
+    @PostMapping("/applyList")
+    public ResponseResult<PageInfo<CloseUpApplyFormSimpleVO>> applyList(@RequestBody @Validated CloseUpQueryRequest request) {
+        return ResponseResult.success(closeUpService.applyList(request));
+    }
+
+    @ApiOperation("申请单详情")
+    @GetMapping("/detail")
+    public ResponseResult<CloseUpApplyFormVO> getDetail(@RequestParam("applyId") Long applyId) {
+        return ResponseResult.success(closeUpService.getDetail(applyId));
+    }
+
+    @ApiOperation("审批通过")
+    @PostMapping("/auditPass")
+    public ResponseResult<Boolean> auditPass(@RequestBody @Validated CloseUpAuditRequest request) {
+        return ResponseResult.success(closeUpService.auditPass(request));
+    }
+
+    @ApiOperation("审批拒绝")
+    @PostMapping("/auditRejected")
+    public ResponseResult<Boolean> auditRefuse(@RequestBody @Validated CloseUpAuditRequest request) {
+        return ResponseResult.success(closeUpService.auditRejected(request));
+    }
+
+    @ApiOperation("查询平台账号列表")
+    @GetMapping("/platformList")
+    public ResponseResult<List<CloseUpPlatformVO>> getPlatformList(@RequestParam("applyId") Long applyId) {
+        return ResponseResult.success(closeUpService.getPlatformListByApplyId(applyId));
+    }
+
+    @ApiOperation("查询审批记录")
+    @GetMapping("/auditRecordList")
+    public ResponseResult<List<AuditInfoResponse>> getAuditRecordList(@RequestParam("applyId") Long applyId) {
+        return ResponseResult.success(closeUpService.getAuditRecordList(applyId));
+    }
+
+    @ApiOperation("平台待办记录-工作台")
+    @GetMapping("/platformTodoList")
+    public ResponseResult<PageInfo<CloseUpApplyFormSimpleVO>> getPlatformTodoList(@Validated CloseUpTodoQueryRequest request) {
+        return ResponseResult.success(closeUpService.getPlatformTodoList(request));
+    }
+
+    @ApiOperation("平台关闭开启处理")
+    @PostMapping("/handlePlatform")
+public ResponseResult<Boolean> handlePlatform(@RequestBody @Validated CloseUpPlatformHandleRequest request) {
+        return ResponseResult.success(closeUpService.handlePlatform(request));
+    }
+}
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniCloseUpController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniCloseUpController.java
@@ -0,0 +1,56 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.request.closeup.CloseUpApplyRequest;
+import com.cool.store.request.closeup.CloseUpApplySimpleQueryRequest;
+import com.cool.store.request.closeup.CloseUpOpenApplyRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.closeup.CloseUpService;
+import com.cool.store.vo.closeup.CloseUpApplyFormSimpleVO;
+import com.cool.store.vo.closeup.CloseUpApplyFormVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * Mini歇业管理
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/4/8
+ */
+@Api(tags = "Mini歇业管理")
+@RestController
+@RequestMapping("/mini/closeup")
+@RequiredArgsConstructor
+@Validated
+public class MiniCloseUpController {
+    private final CloseUpService closeUpService;
+
+    @ApiOperation("歇业申请")
+    @PostMapping("/apply")
+    public ResponseResult<Boolean> closeUpApply(@RequestBody @Validated CloseUpApplyRequest request) {
+        return ResponseResult.success(closeUpService.closeUpApply(request));
+    }
+
+    @ApiOperation("恢复营业申请")
+    @PostMapping("/openApply")
+    public ResponseResult<Boolean> openApply(@RequestBody @Validated CloseUpOpenApplyRequest request) {
+        return ResponseResult.success(closeUpService.openApply(request));
+    }
+
+    @ApiOperation("申请列表")
+    @PostMapping("/list")
+    public ResponseResult<PageInfo<CloseUpApplyFormSimpleVO>> applyList(@RequestBody @Validated CloseUpApplySimpleQueryRequest request) {
+        return ResponseResult.success(closeUpService.miniApplyFormList(request));
+    }
+
+    @ApiOperation("申请单详情")
+    @GetMapping("/detail")
+    public ResponseResult<CloseUpApplyFormVO> getDetail(@RequestParam("applyId") Long applyId) {
+        return ResponseResult.success(closeUpService.getDetail(applyId));
+    }
+}
--- a/coolstore-partner-web/src/main/resources/application-ab.properties
+++ b/coolstore-partner-web/src/main/resources/application-ab.properties
@@ -92,6 +92,8 @@ xfsg.url=https://inf-test.xianfengsg.com/InfService
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
 aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
 aliyun.sms.signName=酷店掌
+aliyun.sms.private.accessKeyId=LTAI5tDp9nFNSca53jjzepE5
+aliyun.sms.private.accessKeySecret=oTWhLJ6t6DeIINFTkAzwlY18ORfyYl

 mybatis.configuration.variables.enterpriseId=5558ce7a3aa84e3590392fcaa8697ffb
 enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f
--- a/coolstore-partner-web/src/main/resources/application-hd.properties
+++ b/coolstore-partner-web/src/main/resources/application-hd.properties
@@ -79,6 +79,8 @@ xfsg.url=https://inf-test.xianfengsg.com/InfService
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
 aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
 aliyun.sms.signName=酷店掌
+aliyun.sms.private.accessKeyId=LTAI5tDp9nFNSca53jjzepE5
+aliyun.sms.private.accessKeySecret=oTWhLJ6t6DeIINFTkAzwlY18ORfyYl

 mybatis.configuration.variables.enterpriseId=214ac5a3a517472a87268e02a2e6410a
 enterprise.dingCorpId=wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g
--- a/coolstore-partner-web/src/main/resources/application-local.properties
+++ b/coolstore-partner-web/src/main/resources/application-local.properties
@@ -88,6 +88,8 @@ xfsg.url=https://inf-test.xianfengsg.com/InfService
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
 aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
 aliyun.sms.signName=酷店掌
+aliyun.sms.private.accessKeyId=LTAI5tDp9nFNSca53jjzepE5
+aliyun.sms.private.accessKeySecret=oTWhLJ6t6DeIINFTkAzwlY18ORfyYl

 mybatis.configuration.variables.enterpriseId=5558ce7a3aa84e3590392fcaa8697ffb
 enterprise.dingCorpId=wpayJeDAAAhGIFgUJpJN-zg39JuNbYhg
--- a/coolstore-partner-web/src/main/resources/application-online.properties
+++ b/coolstore-partner-web/src/main/resources/application-online.properties
@@ -83,6 +83,8 @@ xfsg.url=https://inf.xianfengsg.com/InfService
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
 aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
 aliyun.sms.signName=酷店掌
+aliyun.sms.private.accessKeyId=LTAI5tDp9nFNSca53jjzepE5
+aliyun.sms.private.accessKeySecret=oTWhLJ6t6DeIINFTkAzwlY18ORfyYl

 mybatis.configuration.variables.enterpriseId=214ac5a3a517472a87268e02a2e6410a
 enterprise.dingCorpId=wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g
--- a/coolstore-partner-web/src/main/resources/application-test.properties
+++ b/coolstore-partner-web/src/main/resources/application-test.properties
@@ -89,6 +89,8 @@ xfsg.url=https://inf-test.xianfengsg.com/InfService
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
 aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
 aliyun.sms.signName=酷店掌
+aliyun.sms.private.accessKeyId=LTAI5tDp9nFNSca53jjzepE5
+aliyun.sms.private.accessKeySecret=oTWhLJ6t6DeIINFTkAzwlY18ORfyYl

 mybatis.configuration.variables.enterpriseId=5558ce7a3aa84e3590392fcaa8697ffb
 enterprise.dingCorpId=wpayJeDAAAhGIFgUJpJN-zg39JuNbYhg