add

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

@@ -0,0 +1,44 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.ShopService;
+import com.cool.store.vo.shop.MiniShopPageVO;
+import com.cool.store.vo.shop.StageShopCountVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: PCShopController
+ * @Description:
+ * @date 2024-04-16 14:44
+ */
+@Api(tags = "pc店铺")
+@RestController
+@RequestMapping("/pc/shop")
+public class PCShopController {
+
+    @Resource
+    private ShopService shopService;
+
+    @ApiOperation("获取店铺列表")
+    @GetMapping("/getShopList")
+    public ResponseResult<List<MiniShopPageVO>> getShopList(@RequestParam("lineId")Long lineId) {
+        return ResponseResult.success(shopService.getShopList(lineId));
+    }
+
+    @ApiOperation("获取各个阶段店铺数量")
+    @GetMapping("/getStageShopCount")
+    public ResponseResult<StageShopCountVO> getStageShopCount(@RequestParam("lineId")Long lineId) {
+        return ResponseResult.success(shopService.getStageShopCount(lineId));
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
@@ -194,4 +195,22 @@ public class PointController {
         return ResponseResult.success(pointService.getTodoList(request));
     }
 
+    @ApiOperation("获取租赁合同详情")
+    @GetMapping("/getRentContractDetail")
+    public ResponseResult<ShopRentInfoVO> getRentContractDetail(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(pointService.getRentContractDetail(shopId));
+    }
+
+    @ApiOperation("租赁合同审核")
+    @PostMapping("/auditRentContract")
+    public ResponseResult<Integer> auditRentContract(@RequestBody @Validated AuditRentContractRequest request) {
+        return ResponseResult.success(pointService.auditRentContract(request));
+    }
+
+    @ApiOperation("获取推荐给加盟商的铺位")
+    @PostMapping("/getLineRecommendPointPage")
+    public ResponseResult<PageInfo<MiniPointPageVO>> getLineRecommendPointPage(@RequestBody MiniPointPageRequest request) {
+        return ResponseResult.success(pointService.getLineRecommendPointPage(request));
+    }
+
 }

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

@@ -2,16 +2,14 @@ package com.cool.store.controller.webc;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.PartnerUserHolder;
-import com.cool.store.request.AddPointDetailRequest;
-import com.cool.store.request.MiniPointPageRequest;
-import com.cool.store.request.PointRecommendLineRequest;
-import com.cool.store.request.SelectPointRequest;
+import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.PointService;
 import com.cool.store.service.ShopService;
 import com.cool.store.vo.point.MiniPointPageVO;
 import com.cool.store.vo.point.PointDetailVO;
 import com.cool.store.vo.point.PointPageVO;
+import com.cool.store.vo.point.ShopRentInfoVO;
 import com.cool.store.vo.shop.MiniShopPageVO;
 import com.cool.store.vo.shop.ShopStageInfoVO;
 import com.cool.store.vo.shop.ShopStageVO;
@@ -74,7 +72,7 @@ public class MiniShopController {
         return ResponseResult.success(pointService.getPointDetailInfo(pointId));
     }
 
-    @ApiOperation("选址铺位")
+    @ApiOperation("选择铺位")
     @PostMapping("/selectPoint")
     public ResponseResult<Integer> lineSelectPoint(@RequestBody @Validated SelectPointRequest request) {
         Long lineId = PartnerUserHolder.getUser().getLineId();
@@ -82,10 +80,34 @@ public class MiniShopController {
         return ResponseResult.success(pointService.lineSelectPoint(request));
     }
 
-    @ApiOperation("提交新铺位")
-    @PostMapping("/add")
-    public ResponseResult<Long> addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) {
-        return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId()));
+    @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));
     }
 
+    @ApiOperation("提交新铺位")
+    @PostMapping("/addPoint")
+    public ResponseResult<Long> miniAddPointDetailInfo(@RequestBody @Validated MiniAddPointRequest request) {
+        request.setCurLineId(PartnerUserHolder.getUser().getLineId());
+        return ResponseResult.success(pointService.miniAddPointDetailInfo(request));
+    }
+
+    @ApiOperation("上传租赁合同")
+    @PostMapping("/uploadRentContract")
+    public ResponseResult<Integer> uploadRentContract(@RequestBody @Validated UploadRentContractRequest request) {
+        Long lineId = PartnerUserHolder.getUser().getLineId();
+        request.setCurLineId(lineId);
+        return ResponseResult.success(pointService.uploadRentContract(request));
+    }
+
+    @ApiOperation("获取租赁合同详情")
+    @GetMapping("/getRentContractDetail")
+    public ResponseResult<ShopRentInfoVO> getRentContractDetail(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(pointService.getRentContractDetail(shopId));
+    }
+
+
 }