suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:装修 红圈通回调调整 解除强制限制

Browse Source
This commit is contained in:
suzhuhong
2026-04-22 11:11:25 +08:00
parent a1da6ca445
commit 78ef7e9440
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,70 +140,70 @@ public class OpenApiController {
@ApiOperation("分配测量员，设计组")
@PostMapping("/assignSurveyors")
public ApiResponse<Boolean> assignSurveyors(@RequestBody @Validated AssignSurveyorsRequest request) {
log.info("assignSurveyors request：{}", JSONObject.toJSONString(request));
log.info("decoration_log assignSurveyors request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationMeasureService.assignSurveyors(request));
}
@ApiOperation("门店测量、上传测量图")
@PostMapping("/submitMeasurementDiagram")
public ApiResponse<Boolean> submitMeasurementDiagram(@RequestBody @Validated SubmitMeasurementRequest request) {
log.info("submitMeasurementDiagram request：{}", JSONObject.toJSONString(request));
log.info("decoration_log submitMeasurementDiagram request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationMeasureService.submitMeasurementDiagram(request));
}
@ApiOperation(" 分配设计师")
@PostMapping("/assignDesigner")
public ApiResponse<Boolean> assignDesigner(@RequestBody @Validated AssignDesignerRequest request) {
log.info("assignDesigner request：{}", JSONObject.toJSONString(request));
log.info("decoration_log assignDesigner request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationDesignInfoService.assignDesigner(request));
}
@ApiOperation("上传设计图")
@PostMapping("/submitDesignDrawing")
public ApiResponse<Boolean> submitDesignDrawing(@RequestBody @Validated SubmitDesignDrawingRequest request) {
log.info("submitDesignDrawing request：{}", JSONObject.toJSONString(request));
log.info("decoration_log submitDesignDrawing request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationDesignInfoService.submitDesignDrawing(request));
}
@ApiOperation("分配报价员")
@PostMapping("/assignQuotationStaff")
public ApiResponse<Boolean> assignQuotation(@RequestBody @Validated AssignQuotationRequest request) {
log.info("assignQuotation request：{}", JSONObject.toJSONString(request));
log.info("decoration_log assignQuotation request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationDesignInfoService.assignQuotation(request));
}
@ApiOperation("上传报价单")
@PostMapping("/submitQuotationSheet")
public ApiResponse<Boolean> submitQuotationSheet(@RequestBody @Validated SubmitQuotationSheetRequest request) {
log.info("submitQuotationSheet request：{}", JSONObject.toJSONString(request));
log.info("decoration_log 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));
log.info("decoration_log 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));
log.info("decoration_log 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));
log.info("decoration_log constructionCompleted request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationDesignInfoService.constructionCompleted(request));
}
@ApiOperation("装修验收")
@PostMapping("/hqtDecorationAcceptance")
public ApiResponse<Boolean> decorationAcceptance(@RequestBody @Validated HqtDecorationAcceptanceRequest request) {
log.info("decorationAcceptance request：{}", JSONObject.toJSONString(request));
log.info("decoration_log decorationAcceptance request：{}", JSONObject.toJSONString(request));
return ApiResponse.success(decorationDesignInfoService.decorationAcceptance(request));
}

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

@@ -1,5 +1,6 @@
package com.cool.store.controller.webc;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.decoration.ConstructionScheduleDTO;
@@ -100,6 +101,7 @@ public class MiniDecorationController {
@ApiOperation("提交三方验收签字")
@PostMapping("/submitThreeAcceptanceSign")
public ResponseResult<Boolean> submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){
log.info("decoration_log {}", JSONObject.toJSONString(request));
return ResponseResult.success(decorationService.miniSubmitAcceptanceSign(request));
}
@ApiOperation("查看三方验收签字")
@@ -133,6 +135,7 @@ public class MiniDecorationController {
@ApiOperation("加盟商确定设计方案")
@PostMapping("/confirmDesign")
public ResponseResult<Boolean> confirmDesign(@RequestBody DecorationDesignRequest request){
log.info("decoration_log {}", JSONObject.toJSONString(request));
return ResponseResult.success(decorationService.confirmDesign(request,CurrentUserHolder.getUser()));
}