Merge #32 into master from cc_20260113_open

开业日期报备

* cc_20260113_open: (15 commits squashed)

  - feat:阶段调整

  - feat:开业阶段调整

  - feat:开业日期报备

  - feat:开业日期报备代办

  - feat:文本通知

  - feat:数据处理

  - fix:bug

  - feat:通知功能

  - Merge branch 'master' into cc_20260113_open
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java

  - feat:开业代办新增代办预计开业时间

  - feat:开业时间查询

  - feat:开业

  - feat:PC计划开业时间

  - Merge branch 'master' into cc_20260113_open
    
    # Conflicts:
    #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

  - Merge branch 'master' into cc_20260113_open
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/32

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

@@ -215,6 +215,13 @@ public class DeskController {
         return ResponseResult.success(deskService.openingAcceptance(   deskRequest, userInfo   ));
     }
 
+    @ApiOperation("待处理-开业日期报备代办")
+    @PostMapping("/openingConfirmPendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> openingConfirmPendingList(@RequestBody DeskRequest deskRequest) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.openingConfirmPendingList(   deskRequest, userInfo   ));
+    }
+
     @ApiOperation("待处理-测量阶段")
     @PostMapping("/measurePendingList")
     public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestBody DeskRequest deskRequest) {

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java

@@ -2,6 +2,7 @@ package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.dto.BatchStatusRefreshDTO;
+import com.cool.store.dto.OpenInfoDTO;
 import com.cool.store.dto.TransferLogDTO;
 import com.cool.store.dto.UserDTO;
 import com.cool.store.request.*;
@@ -177,4 +178,22 @@ public class PCShopController {
     public ResponseResult<Boolean> isShowButton(@RequestParam("shopId")Long shopId) {
         return ResponseResult.success(shopService.isShowButton(shopId));
     }
+
+    @ApiOperation("确定实际开业时间")
+    @PostMapping("/confirmActualOpenDate")
+    public ResponseResult<Boolean> confirmActualOpenDate(@RequestBody @Validated OpenDateReportRequest request) {
+        return ResponseResult.success(shopService.confirmOpen( request,CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("PC开业时间详情")
+    @GetMapping("/getShopOpenInfo")
+    public ResponseResult<OpenInfoDTO> getShopOpenInfo(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(shopService.getShopOpenInfo(shopId));
+    }
+
+    @ApiOperation("PC提交计划开业时间")
+    @PostMapping("/submitPlanOpenDate")
+    public ResponseResult<Boolean> getRecommendedOrMyPointList(@RequestBody @Validated OpenDateReportRequest request) {
+        return ResponseResult.success(shopService.submitOpenDateReport( request));
+    }
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

@@ -225,6 +225,11 @@ public class PCTestController {
         return ResponseResult.success(dataHandleService.dataHandleService(shopId));
     }
 
+    @GetMapping("/openStageBatchInsert")
+    public ResponseResult<Boolean> openStageBatchInsert(@RequestParam("shopId")Long shopId){
+        return ResponseResult.success(dataHandleService.openStageBatchInsert(shopId));
+    }
+
     @GetMapping("/dataHandleServiceV25")
     public ResponseResult<Integer> dataHandleServiceV25(){
         return ResponseResult.success(dataHandleService.dataHandleServiceV25());

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webc;
 
 import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.dto.OpenInfoDTO;
 import com.cool.store.request.*;
 import com.cool.store.response.BranchShopDetailResponse;
 import com.cool.store.response.MiniShopsResponse;
@@ -158,4 +159,15 @@ public class MiniShopController {
         return ResponseResult.success(pointService.getPointFinancialInfo( pointId));
     }
 
+    @ApiOperation("提交计划开业时间")
+    @PostMapping("/submitPlanOpenDate")
+    public ResponseResult<Boolean> getRecommendedOrMyPointList(@RequestBody @Validated OpenDateReportRequest request) {
+        return ResponseResult.success(shopService.submitOpenDateReport( request));
+    }
+
+    @ApiOperation("Mini开业时间详情")
+    @GetMapping("/getShopOpenInfo")
+    public ResponseResult<OpenInfoDTO> getShopOpenInfo(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(shopService.getShopOpenInfo(shopId));
+    }
 }