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

feat

Browse Source
This commit is contained in:
shuo.wang
2025-07-25 10:40:44 +08:00
parent 2859a8bc75
commit 55c102ed96
2 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml
View File

@@ -25,9 +25,7 @@
</resultMap>
<select id="selectByShopId" resultMap="BaseResultMap">
select
id,shop_id,measure_user_id,design_user_id,measure_date,diagram_date,measure_url,remark,
submit_time,create_time,update_time,deleted,create_user_id,update_user_id
select *
from xfsg_decoration_measure where shop_id = #{shopId} and deleted = 0
</select>
<select id="selectByMeasureUserIdAndShopStage"

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

@@ -1,5 +1,6 @@
package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.RedisConstant;
import com.cool.store.dao.*;
import com.cool.store.dto.FoodTokenDTO;
@@ -16,13 +17,14 @@ import com.cool.store.mapper.FranchiseFeeMapper;
import com.cool.store.mapper.LineInfoMapper;
import com.cool.store.mapper.ShopInfoMapper;
import com.cool.store.mq.util.HttpRestTemplateService;
import com.cool.store.request.GetPasswordDTO;
import com.cool.store.request.*;
import com.cool.store.request.bigdata.ProfitDataRequest;
import com.cool.store.request.huoma.ShopBasicInfoRequest;
import com.cool.store.request.oppty.*;
import com.cool.store.request.xgj.PushFranchiseFeeRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.bigdata.ActDataResponse;
import com.cool.store.response.bigdata.ApiResponse;
import com.cool.store.response.bigdata.ProfitDataResponse;
import com.cool.store.response.bigdata.ProfitRateResponse;
import com.cool.store.response.huoma.ShopBaseInfoResponse;
@@ -51,6 +53,10 @@ import java.util.stream.Collectors;
@RequestMapping("/pc/test")
public class PCTestController {
@Resource
private DecorationDesignInfoService decorationDesignInfoService;
@Resource
private DecorationMeasureService decorationMeasureService;
@Resource
private SyncMainSysServer syncMainSysServer;
@Resource
@@ -425,4 +431,74 @@ public class PCTestController {
return ResponseResult.success(pushService.getHqtToken());
}
@ApiOperation("分配测量员，设计组")
@PostMapping("/assignSurveyors")
public ApiResponse<Boolean> assignSurveyors(@RequestBody @Validated AssignSurveyorsRequest request) {
log.info("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));
return ApiResponse.success(decorationMeasureService.submitMeasurementDiagram(request));
}
@ApiOperation(" 分配设计师")
@PostMapping("/assignDesigner")
public ApiResponse<Boolean> assignDesigner(@RequestBody @Validated AssignDesignerRequest request) {
log.info("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));
return ApiResponse.success(decorationDesignInfoService.submitDesignDrawing(request));
}
@ApiOperation("分配报价员")
@PostMapping("/assignQuotation")
public ApiResponse<Boolean> assignQuotation(@RequestBody @Validated AssignQuotationRequest request) {
log.info("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));
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));
}
}