diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 03c7bffa0..b375dc75a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -53,8 +53,7 @@ public class SignValidateFilter implements Filter { "/xfsg/favicon.ico", "/xfsg/v2/api-docs","/**/test/**", "/xfsg/mini/program/oss/getUploadFileConfig", - // - "/xfsg/mini/decoration/**", + "/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo", "/**/swagger*/**", "/**/webjars/**", diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java index cbdfa6fad..37b5e09c8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -39,11 +39,7 @@ public class PCDecorationController { public ResponseResult get(@RequestParam Long shopId){ return ResponseResult.success( decorationService.DesignInfo(shopId)) ; } - @ApiModelProperty("获取装修款信息,和二维码") - @GetMapping("/getDecorationModel") - public ResponseResult getDecorationModel(@RequestParam Long shopId){ - return ResponseResult.success(decorationService.DecorationModel(shopId)) ; - } + @ApiModelProperty("获取施工阶段信息") @GetMapping("/getConstruction") public ResponseResult> getConstruction(@RequestParam Long shopId){ 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 24a2bf85a..93964e743 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,16 +1,15 @@ package com.cool.store.controller.webc; import com.cool.store.context.PartnerUserHolder; +import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.DecorationService; import com.cool.store.vo.PartnerUserInfoVO; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -34,4 +33,9 @@ public class MiniDecorationController { decorationService.submitDecorationModel(linePaySubmitRequest, user); return ResponseResult.success(); } + @ApiModelProperty("获取装修款信息,和二维码") + @GetMapping("/getDecorationModel") + public ResponseResult getDecorationModel(@RequestParam Long shopId){ + return ResponseResult.success(decorationService.DecorationModel(shopId)) ; + } }