diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java index e806648df..7d163c6b9 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webc; import com.cool.store.context.PartnerUserHolder; +import com.cool.store.dto.decoration.ConstructionScheduleDTO; import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.request.ThreeAcceptanceRequest; @@ -8,14 +9,17 @@ import com.cool.store.response.ResponseResult; import com.cool.store.response.ThreeAcceptanceResponse; import com.cool.store.service.DecorationService; import com.cool.store.vo.DecorationModelVO; +import com.cool.store.vo.DesignInfoVo; import com.cool.store.vo.PartnerUserInfoVO; import com.sun.xml.bind.v2.TODO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * @Auther: WangShuo @@ -31,12 +35,22 @@ public class MiniDecorationController { @Resource private DecorationService decorationService; @PostMapping("/submitDecorationModel") - + @ApiOperation("提交装修款") public ResponseResult submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){ PartnerUserInfoVO user = PartnerUserHolder.getUser(); //TODO return ResponseResult.success(decorationService.submitDecorationModel(linePaySubmitRequest, user)); } + @ApiModelProperty("获取设计阶段信息") + @GetMapping("/design") + public ResponseResult get(@RequestParam Long shopId){ + return ResponseResult.success( decorationService.DesignInfo(shopId)) ; + } + @ApiModelProperty("获取施工阶段信息") + @GetMapping("/getConstruction") + public ResponseResult> getConstruction(@RequestParam Long shopId){ + return ResponseResult.success(decorationService.getConstruction(shopId)) ; + } @ApiModelProperty("获取装修款信息,和二维码") @GetMapping("/getDecorationModel") public ResponseResult getDecorationModel(@RequestParam Long shopId){