Merge #33 into master from cc_20260106_point_update

铺位管理 地图

* cc_20260106_point_update: (15 commits squashed)

  - feat:铺位改造

  - Merge branch 'refs/heads/master' into cc_20260106_point_update

  - feat:铺位调整

  - feat:新增字段

  - feat:新增字段

  - feat:新增字段

  - feat:点位ID 处理校验规则

  - feat:保存铺位 返回点位ID

  - feat:根据主数据门店编码获取CRM点位数据

  - feat:铺位

  - feat:我的铺位 根据管辖

  - fix:bug 查询

  - fix:PC端点位新增直接关联铺位 bug

  - feat:过滤已开店的铺位

  - Merge branch 'master' into cc_20260106_point_update

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/33

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

@@ -1,6 +1,8 @@
 package com.cool.store.controller.webb;
 
+import com.cool.store.dto.recipe.RecipeSpLaunchDTO;
 import com.cool.store.request.recipe.RevenueDataRequest;
+import com.cool.store.request.recipe.SalesVolumeDayRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.ThirdFoodService;
 import com.cool.store.vo.recipe.RevenueDataVO;
@@ -34,4 +36,16 @@ public class DataBoardController {
     public ResponseResult<List<RevenueDataVO>> getStoreRevenueData(@RequestBody @Valid RevenueDataRequest request) {
         return ResponseResult.success(thirdFoodService.getRevenueData(request));
     }
+
+    @ApiOperation("查询菜品服务包上新数据")
+    @PostMapping("/recipeSpLaunch")
+    public ResponseResult<RecipeSpLaunchDTO> getRecipeSpLaunchData(@RequestBody @Valid RevenueDataRequest request) {
+        return ResponseResult.success(thirdFoodService.getRecipeServiceLaunch(request));
+    }
+
+    @ApiOperation("门店日销量")
+    @PostMapping("/storeSalesVolumeDay")
+    public ResponseResult<List<RevenueDataVO>> getStoreSalesVolumeDay(@RequestBody @Valid SalesVolumeDayRequest request) {
+        return ResponseResult.success(thirdFoodService.storeSalesVolumeDay(request));
+    }
 }

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

@@ -2,8 +2,12 @@ package com.cool.store.controller.webb;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.dto.point.PointStatisticsDTO;
 import com.cool.store.dto.point.ShopPointDTO;
 import com.cool.store.request.*;
+import com.cool.store.request.point.AddPointFinancialDataRequest;
+import com.cool.store.request.point.UpdatePointFinancialDataRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.PointService;
 import com.cool.store.vo.LinePointBaseInfoVO;
@@ -35,32 +39,40 @@ public class PointController {
     @Resource
     private PointService pointService;
 
-    @ApiOperation("新增铺位")
+    @ApiOperation("新增铺位 v3.0(保存铺位)")
     @PostMapping("/add")
     public ResponseResult<Long> addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) {
         log.info("新增铺位：{}", JSONObject.toJSONString(shopPointDetailRequest));
         return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUser()));
     }
 
-    @ApiOperation("铺位详情")
+    @ApiOperation("铺位详情 v3.0新增字段")
     @GetMapping("/detail")
     public ResponseResult<PointDetailVO> getPointDetailInfo(@RequestParam("pointId")Long pointId,
                                                             @RequestParam(value = "isGetNodeNo", required = false)Boolean isGetNodeNo) {
         return ResponseResult.success(pointService.getPointDetailInfo(pointId, isGetNodeNo));
     }
 
-    @ApiOperation("完善铺位")
+    @ApiOperation("完善铺位 v3.0修改铺位")
     @PostMapping("/update")
     public ResponseResult<Long> updatePointDetailInfo(@RequestBody @Validated UpdatePointDetailRequest shopPointDetailRequest) {
         return ResponseResult.success(pointService.updatePointDetailInfo(shopPointDetailRequest,CurrentUserHolder.getUser()));
     }
 
-    @ApiOperation("生成评估报告")
-    @PostMapping("/generateEvaluationReport")
-    public ResponseResult<Integer> generateEvaluationReport(@RequestBody PointIdRequest request) {
-        return ResponseResult.success(pointService.generateEvaluationReport(request.getPointId()));
+    @ApiOperation("提交铺位 v3.0新增")
+    @PostMapping("/submitPoint")
+    public ResponseResult<Long> submitPoint(@RequestBody @Validated UpdatePointDetailRequest shopPointDetailRequest) {
+        return ResponseResult.success(pointService.submitPoint(shopPointDetailRequest,CurrentUserHolder.getUser()));
     }
 
+
+
+//    @ApiOperation("生成评估报告 废弃")
+//    @PostMapping("/generateEvaluationReport")
+//    public ResponseResult<Integer> generateEvaluationReport(@RequestBody PointIdRequest request) {
+//        return ResponseResult.success(pointService.generateEvaluationReport(request.getPointId()));
+//    }
+
     @ApiOperation("铺位失效")
     @PostMapping("/invalid")
     public ResponseResult<Integer> pointInvalid(@RequestBody PointIdRequest request) {
@@ -79,7 +91,7 @@ public class PointController {
         return ResponseResult.success(pointService.addMapEvaluationReport(request));
     }
 
-    @ApiOperation("选址人员提交审批")
+    @ApiOperation("提交审批 ")
     @PostMapping("/submitAudit")
     public ResponseResult<Integer> submitAudit(@RequestBody @Validated SubmitPointAuditRequest request) {
         return ResponseResult.success(pointService.submitAudit(request));
@@ -103,11 +115,11 @@ public class PointController {
         return ResponseResult.success(pointService.getTodoUserList(pointId));
     }
 
-    @ApiOperation("营运人员审批")
-    @PostMapping("/operationUserAudit")
-    public ResponseResult<Integer> operationUserAudit(@RequestBody @Validated OperationAuditRequest request) {
-        return ResponseResult.success(pointService.operationUserAudit(CurrentUserHolder.getUserId(), request));
-    }
+//    @ApiOperation("营运人员审批 V3.0废弃")
+//    @PostMapping("/operationUserAudit")
+//    public ResponseResult<Integer> operationUserAudit(@RequestBody @Validated OperationAuditRequest request) {
+//        return ResponseResult.success(pointService.operationUserAudit(CurrentUserHolder.getUserId(), request));
+//    }
 
     @ApiOperation("审批(排除第二级审批)")
     @PostMapping("/audit")
@@ -148,11 +160,10 @@ public class PointController {
         return ResponseResult.success(pointService.getMyPointData(CurrentUserHolder.getUserId()));
     }
 
-    @ApiOperation("我的铺位-已入库/暂未入库")
+    @ApiOperation("铺位管理-已入库/暂未入库 V3.0 新增 根据管辖")
     @PostMapping("/getMyPointPage")
     public ResponseResult<PageInfo<PointPageVO>> getMyPointPage(@RequestBody @Validated PointPageRequest request) {
-        request.setDevelopmentManager(CurrentUserHolder.getUserId());
-        return ResponseResult.success(pointService.getMyPointPage(request));
+        return ResponseResult.success(pointService.getMyPointPage(request, CurrentUserHolder.getUserId()));
     }
 
     @ApiOperation("全部铺位")
@@ -162,6 +173,27 @@ public class PointController {
         return ResponseResult.success(pointService.getTeamPointPage(request));
     }
 
+    @ApiOperation("获取所有的铺位-地图")
+    @PostMapping("/getALlPointList")
+    public ResponseResult<List<PointMapVO>> getALlPointList(@RequestBody @Validated PointMapRequest request) {
+        request.setCurrentUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(pointService.getAllPointList(request));
+    }
+
+    @ApiOperation("分页获取铺位列表-地图")
+    @PostMapping("/getPointPageList")
+    public ResponseResult<PageInfo<PointMapVO>> getTeamPointPage(@RequestBody @Validated PointMapRequest request) {
+        request.setCurrentUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(pointService.getPointPageList(request));
+    }
+
+    @ApiOperation("铺位统计 V3.0 新增")
+    @PostMapping("/getPointStatistics")
+    public ResponseResult<PointStatisticsDTO> getPointStatistics(@RequestBody @Validated AllPointPageRequest request) {
+        request.setCurUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(pointService.getPointStatistics(request));
+    }
+
     @ApiOperation("获取单个铺位审批记录")
     @GetMapping("/getAuditRecord")
     public ResponseResult<List<PointAuditRecordVO>> getPointAllAuditRecord(@RequestParam("pointId")Long pointId) {
@@ -254,4 +286,27 @@ public class PointController {
         return ResponseResult.success(pointService.uploadRentContract(request));
     }
 
+    @ApiOperation("保存点位测算 V3.0 新增")
+    @PostMapping("/savePointFinancialInfo")
+    public ResponseResult<Boolean> savePointFinancialInfo(@RequestBody @Validated AddPointFinancialDataRequest request) {
+        return ResponseResult.success(pointService.savePointFinancialInfo( request,CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("修改点位测算 V3.0 新增")
+    @PostMapping("/updatePointFinancialInfo")
+    public ResponseResult<Boolean> updatePointFinancialInfo(@RequestBody @Validated UpdatePointFinancialDataRequest request) {
+        return ResponseResult.success(pointService.updatePointFinancialInfo( request,CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("获取点位测算详情 根据点位ID V3.0 新增")
+    @GetMapping("/getPointFinancialInfo")
+    public ResponseResult<PointFinancialDataVO> getPointFinancialInfo(@RequestParam("pointId") Long pointId) {
+        return ResponseResult.success(pointService.getPointFinancialInfo( pointId));
+    }
+
+    @ApiOperation("根据门店编码获取绑定的门店的门店铺位测算数据 V3.0 新增")
+    @GetMapping("/getPointFinancialInfoByStoreCode")
+    public ResponseResult<PointFinancialDataVO> getPointFinancialInfoByStoreCode(@RequestParam("storeCode") String storeCode) {
+        return ResponseResult.success(pointService.getPointFinancialInfoByStoreCode( storeCode));
+    }
 }

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

@@ -11,6 +11,7 @@ import com.cool.store.service.ShopService;
 import com.cool.store.vo.PartnerUserInfoVO;
 import com.cool.store.vo.point.MiniPointPageVO;
 import com.cool.store.vo.point.PointDetailVO;
+import com.cool.store.vo.point.PointFinancialDataVO;
 import com.cool.store.vo.point.ShopRentInfoVO;
 import com.cool.store.vo.shop.MiniShopPageVO;
 import com.cool.store.vo.shop.ShopStageInfoVO;
@@ -87,12 +88,12 @@ public class MiniShopController {
         return ResponseResult.success(pointService.lineRejectPoint(request));
     }
 
-    @ApiOperation("提交新铺位")
-    @PostMapping("/addPoint")
-    public ResponseResult<Long> miniAddPointDetailInfo(@RequestBody @Validated MiniAddPointRequest request) {
-        request.setCurLineId(PartnerUserHolder.getUser().getLineId());
-        return ResponseResult.success(pointService.miniAddPointDetailInfo(request));
-    }
+//    @ApiOperation("提交新铺位 V3.0废弃")
+//    @PostMapping("/addPoint")
+//    public ResponseResult<Long> miniAddPointDetailInfo(@RequestBody @Validated MiniAddPointRequest request) {
+//        request.setCurLineId(PartnerUserHolder.getUser().getLineId());
+//        return ResponseResult.success(pointService.miniAddPointDetailInfo(request));
+//    }
 
     @ApiOperation("上传租赁合同")
     @PostMapping("/uploadRentContract")
@@ -151,4 +152,10 @@ public class MiniShopController {
         return ResponseResult.success(shopService.getBranchShopDetail(shopId));
     }
 
+    @ApiOperation("小程序获取点位测算详情 根据点位ID V3.0 新增")
+    @GetMapping("/getPointFinancialInfo")
+    public ResponseResult<PointFinancialDataVO> getPointFinancialInfo(@RequestParam("pointId") Long pointId) {
+        return ResponseResult.success(pointService.getPointFinancialInfo( pointId));
+    }
+
 }