装修接口

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

@@ -113,5 +113,39 @@ public class OpenApiController {
         return ApiResponse.success(decorationDesignInfoService.assignQuotation(request));
     }
 
+    @ApiOperation("上传报价单")
+    @PostMapping("/submitQuotationSheet")
+    public ApiResponse<Boolean> submitQuotationSheet(@RequestBody @Validated SubmitQuotationSheetRequest request) {
+        log.info("submitQuotationSheet request：{}", JSONObject.toJSONString(request));
+        return ApiResponse.success(decorationDesignInfoService.submitQuotationSheet(request));
+    }
+
+    @ApiOperation("施工派单")
+    @PostMapping("/submitConstructionOrder")
+    public ApiResponse<Boolean> submitConstructionOrder(@RequestBody @Validated ConstructionOrderRequest request) {
+        log.info("submitConstructionOrder request：{}", JSONObject.toJSONString(request));
+        return ApiResponse.success(decorationDesignInfoService.submitConstructionOrder(request));
+    }
+
+    @ApiOperation("实际进场确认")
+    @PostMapping("/entryConfirmation")
+    public ApiResponse<Boolean> entryConfirmation(@RequestBody @Validated EntryConfirmationRequest request) {
+        log.info("entryConfirmation request：{}", JSONObject.toJSONString(request));
+        return ApiResponse.success(decorationDesignInfoService.entryConfirmation(request));
+    }
+
+    @ApiOperation("施工完成")
+    @PostMapping("/constructionCompleted")
+    public ApiResponse<Boolean> constructionCompleted(@RequestBody @Validated ConstructionCompletedRequest request) {
+        log.info("constructionCompleted request：{}", JSONObject.toJSONString(request));
+        return ApiResponse.success(decorationDesignInfoService.constructionCompleted(request));
+    }
+
+    @ApiOperation("装修验收")
+    @PostMapping("/decorationAcceptance")
+    public ApiResponse<Boolean> decorationAcceptance(@RequestBody @Validated HqtDecorationAcceptanceRequest request) {
+        log.info("decorationAcceptance request：{}", JSONObject.toJSONString(request));
+        return ApiResponse.success(decorationDesignInfoService.decorationAcceptance(request));
+    }
 
 }

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

@@ -5,6 +5,8 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dto.decoration.ConstructionScheduleDTO;
 import com.cool.store.entity.ShopAuditInfoDO;
 import com.cool.store.request.*;
+import com.cool.store.response.DecorationDesignResponse;
+import com.cool.store.response.MeasureResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.DecorationMeasureService;
@@ -27,7 +29,7 @@ import java.util.List;
  * @Auther: WangShuo
  * @Date: 2024/04/28/下午4:19
  * @Version 1.0
- * @注释:
+ * @注释: 废弃
  */
 @RestController
 @RequestMapping("/pc/decoration")
@@ -147,7 +149,7 @@ public class PCDecorationController {
 
     @ApiOperation("查询设计方案")
     @GetMapping("/getDecorationDesign")
-    public ResponseResult<DecorationDesignVO> getDecorationDesign(@RequestParam Long shopId) {
+    public ResponseResult<DecorationDesignResponse> getDecorationDesign(@RequestParam Long shopId) {
         return ResponseResult.success(decorationService.getDecorationDesign(shopId));
     }
 
@@ -171,8 +173,8 @@ public class PCDecorationController {
 
     @ApiOperation("查询测量方案")
     @GetMapping("/getDecorationMeasure/{shopId}")
-    public ResponseResult<DecorationMeasureVO> getDecorationMeasure(@PathVariable Long shopId) {
-        return ResponseResult.success(decorationMeasureService.getDecorationMeasureByShopId(shopId));
+    public ResponseResult<MeasureResponse> getDecorationMeasure(@PathVariable Long shopId) {
+        return ResponseResult.success(decorationMeasureService.getMeasureData(shopId));
     }
 
     @ApiOperation("保存测量方案")

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

@@ -10,6 +10,8 @@ import com.cool.store.request.DecorationDesignRequest;
 import com.cool.store.request.LinePaySubmitRequest;
 import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
+import com.cool.store.response.DecorationDesignResponse;
+import com.cool.store.response.MeasureResponse;
 import com.cool.store.response.ResponseResult;
 
 import com.cool.store.response.ThreeSignResponse;
@@ -118,7 +120,7 @@ public class MiniDecorationController {
 
     @ApiOperation("查询设计方案")
     @GetMapping("/getDecorationDesign")
-    public ResponseResult<DecorationDesignVO> getDecorationDesign(@RequestParam Long shopId){
+    public ResponseResult<DecorationDesignResponse> getDecorationDesign(@RequestParam Long shopId){
         return ResponseResult.success(decorationService.getDecorationDesign(shopId));
     }
 
@@ -136,7 +138,7 @@ public class MiniDecorationController {
 
     @ApiOperation("查询测量方案")
     @GetMapping("/getDecorationMeasure")
-    public ResponseResult<DecorationMeasureVO> getDecorationMeasure(@RequestParam Long shopId){
-        return ResponseResult.success(decorationMeasureService.getDecorationMeasureByShopId(shopId));
+    public ResponseResult<MeasureResponse> getDecorationMeasure(@RequestParam Long shopId) {
+        return ResponseResult.success(decorationMeasureService.getMeasureData(shopId));
     }
 }