feat:V2.4

2025-01-10 19:02:16 +08:00
parent 81b135bba6
commit 5d2afdf9c5
36 changed files with 702 additions and 322 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
@@ -39,29 +39,6 @@ public class DeskController {
        return ResponseResult.success(deskService.intendPendingList(pageNumber,pageSize,userInfo.getUserId()));
    }

-    @ApiOperation("待处理-邀约面谈")
-    @GetMapping("/interviewPendingList")
-    public ResponseResult<PageInfo<InterviewPendingVO>> interviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
-                                                                             @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
-        LoginUserInfo userInfo = CurrentUserHolder.getUser();
-        return ResponseResult.success(deskService.interviewPendingList(pageNumber,pageSize,userInfo.getUserId()));
-    }
-
-    @ApiOperation("待处理-一审")
-    @GetMapping("/firstInterviewPendingList")
-    public ResponseResult<PageInfo<InterviewPendingVO>> firstInterviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
-                                                                             @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
-        LoginUserInfo userInfo = CurrentUserHolder.getUser();
-        return ResponseResult.success(deskService.firstInterviewPendingList(pageNumber,pageSize,userInfo));
-    }
-
-    @ApiOperation("待处理-二审")
-    @GetMapping("/secondInterviewPendingList")
-    public ResponseResult<PageInfo<InterviewPendingVO>> secondInterviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
-                                                                             @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
-        LoginUserInfo userInfo = CurrentUserHolder.getUser();
-        return ResponseResult.success(deskService.secondInterviewPendingList(pageNumber,pageSize,userInfo));
-    }


    @ApiOperation("待处理-缴纳意向金")
@@ -80,13 +57,6 @@ public class DeskController {
        return ResponseResult.success(deskService.signingPendingList(pageNumber,pageSize,userInfo));
    }

-    @ApiOperation("待处理-实训体验")
-    @GetMapping("/storeExperiencePendingList")
-    public ResponseResult<PageInfo<StoreExperiencePendingVO>> storeExperiencePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
-                                                                                         @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
-        LoginUserInfo userInfo = CurrentUserHolder.getUser();
-        return ResponseResult.success(deskService.storeExperiencePendingList(pageNumber,pageSize,userInfo));
-    }


    @ApiOperation("待处理-数据")
@@ -105,13 +75,6 @@ public class DeskController {
        return ResponseResult.success(deskService.getInvestmentCount(userInfo));
    }

-    @ApiOperation("待处理-系统建店")
-    @GetMapping("/systemBuildStorePendingList")
-    public ResponseResult<PageInfo<PreparationCommonPendingVO>> systemBuildStorePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
-                                                                         @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
-        LoginUserInfo userInfo = CurrentUserHolder.getUser();
-        return ResponseResult.success(deskService.systemBuildStorePendingList(pageNumber,pageSize,userInfo));
-    }
    @ApiOperation("待处理-支付加盟费保证金")
    @GetMapping("/payFranchiseFeesPendingList")
    public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@@ -141,13 +104,6 @@ public class DeskController {
        LoginUserInfo userInfo = CurrentUserHolder.getUser();
        return ResponseResult.success(deskService.openingAndOperationPlanPendingList(pageNumber,pageSize,userInfo));
    }
-    @ApiOperation("待处理-首批订货清单")
-    @GetMapping("/firstOrderListPendingList")
-    public ResponseResult<PageInfo<PreparationCommonPendingVO>> firstOrderListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
-                                                                                            @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
-        LoginUserInfo userInfo = CurrentUserHolder.getUser();
-        return ResponseResult.success(deskService.firstOrderListPendingList(pageNumber,pageSize,userInfo));
-    }

    @ApiOperation("待处理-培训登记")
    @GetMapping("/trainListPendingList")
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
@@ -123,4 +123,11 @@ public class PCShopController {
        String userId = CurrentUserHolder.getUserId();
        return ResponseResult.success(shopService.getBranchShopList(request, userId));
    }
+
+
+    @ApiOperation("门店结束跟进")
+    @GetMapping("/shopClose")
+    public ResponseResult<Boolean> shopClose(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(shopService.shopClose(shopId));
+    }
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java
@@ -2,11 +2,13 @@ package com.cool.store.controller.webb;

 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.dto.point.ShopPointDTO;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.PointService;
 import com.cool.store.vo.LinePointBaseInfoVO;
 import com.cool.store.vo.point.*;
+import com.cool.store.vo.shop.ShopPointBaseInfoVO;
 import com.cool.store.vo.shop.ShopStageVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -126,6 +128,14 @@ public class PointController {
        return ResponseResult.success(pointService.getLinePage(request));
    }

+    @ApiOperation("查询我负责的门店列表-门店的选址经理是我")
+    @PostMapping("/getShopPage")
+    public ResponseResult<PageInfo<ShopPointBaseInfoVO>> getShopPage(@RequestBody PointLinePageRequest request) {
+        request.setDevelopmentManager(CurrentUserHolder.getUserId());
+        return ResponseResult.success(pointService.getShopPage(request));
+    }
+
+
    @ApiOperation("获取单个加盟商选址数据")
    @GetMapping("/getLineInfo")
    public ResponseResult<LinePointBaseInfoVO> getLineInfo(@RequestParam("lineId") Long lineId) {
@@ -158,12 +168,20 @@ public class PointController {
        return ResponseResult.success(pointService.getPointAllAuditRecord(pointId));
    }

-    @ApiOperation("获取加盟商的推荐铺位列表")
+    @ApiOperation("获取加盟商的推荐铺位列表-V2.4废弃")
    @GetMapping("/getLineRecommendPointList")
+    @Deprecated
    public ResponseResult<List<PointRecommendPageVO>> getLineRecommendPointList(@RequestParam("lineId")Long lineId) {
        return ResponseResult.success(pointService.getLineRecommendPointList(lineId));
    }

+    @ApiOperation("获取门店的推荐铺位列表-V2.4新增")
+    @GetMapping("/getShopRecommendPointList")
+    public ResponseResult<List<PointRecommendPageVO>> getShopRecommendPointList(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(pointService.getShopRecommendPointList(shopId));
+    }
+
+
    @ApiOperation("选址人员获取可推荐铺位列表")
    @PostMapping("/getRecommendPointList")
    public ResponseResult<PageInfo<PointPageVO>> getRecommendPointList(@RequestBody @Validated RecommendPointPageRequest request) {
@@ -171,21 +189,21 @@ public class PointController {
        return ResponseResult.success(pointService.getRecommendPointList(request));
    }

-    @ApiOperation("加盟商详情推送铺位")
+    @ApiOperation("加盟商详情推送铺位->v2.4 门店详情推荐铺位")
    @PostMapping("/lineRecommendPoint")
    public ResponseResult<Integer> lineRecommendPoint(@RequestBody @Validated LineRecommendPointRequest request) {
        request.setDevelopmentManager(CurrentUserHolder.getUserId());
        return ResponseResult.success(pointService.lineRecommendPoint(request));
    }

-    @ApiOperation("铺位详情推送加盟商")
+    @ApiOperation("铺位详情推送加盟商->v2.4 铺位详情推送门店")
    @PostMapping("/pointRecommendLine")
    public ResponseResult<Integer> pointRecommendLine(@RequestBody @Validated PointRecommendLineRequest request) {
        request.setDevelopmentManager(CurrentUserHolder.getUserId());
        return ResponseResult.success(pointService.pointRecommendLine(request));
    }

-    @ApiOperation("选址人员转让加盟商")
+    @ApiOperation("选址人员转让加盟商->v2.4 选址人员转让门店选址经理")
    @PostMapping("/turnLine")
    public ResponseResult<Integer> turnLine(@RequestBody @Validated TurnLineRequest request) {
        return ResponseResult.success(pointService.turnLine(request));
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java
@@ -59,8 +59,6 @@ public class MiniShopController {
    @ApiOperation("获取推荐给我的铺位")
    @PostMapping("/getLineRecommendPointPage")
    public ResponseResult<PageInfo<MiniPointPageVO>> getLineRecommendPointPage(@RequestBody MiniPointPageRequest request) {
-        Long lineId = PartnerUserHolder.getUser().getLineId();
-        request.setLineId(lineId);
        return ResponseResult.success(pointService.getLineRecommendPointPage(request));
    }

@@ -82,8 +80,6 @@ public class MiniShopController {
    @ApiOperation("拒绝铺位")
    @PostMapping("/rejectPoint")
    public ResponseResult<Integer> lineRejectPoint(@RequestBody @Validated RejectPointRequest request) {
-        Long lineId = PartnerUserHolder.getUser().getLineId();
-        request.setLineId(lineId);
        return ResponseResult.success(pointService.lineRejectPoint(request));
    }

--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
@@ -21,6 +21,7 @@ import com.cool.store.response.ResponseResult;
 import com.cool.store.response.xfsgFirstOderListResponse;
 import com.cool.store.service.AliyunService;
 import com.cool.store.service.CoolStoreStartFlowService;
+import com.cool.store.service.PointService;
 import com.cool.store.service.RegionService;
 import com.cool.store.utils.poi.ExcelUtil;
 import com.cool.store.utils.poi.StringUtils;
@@ -259,6 +260,13 @@ public class TestController {
    }


+    @Resource
+    PointService pointService;
+    @GetMapping("/linePointToShopPoint")
+    public ResponseResult linePointToShopPoint(@RequestParam("shopId")Long shopId){
+        return ResponseResult.success(pointService.linePointToShopPoint(shopId));
+    }
+


 }