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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-28 17:58:52 +08:00
parent 6e0b7073cb 4b00acf753
commit ef1ef9a9f6
24 changed files with 282 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,11 +3,11 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.OpenAcceptanceRequest;
import com.cool.store.request.ShopAcceptanceRequest;
import com.cool.store.request.ShopStageAcceptanceRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.OpenAcceptanceInfoService;
import com.cool.store.vo.OpenAcceptanceInfoListVO;
import com.cool.store.vo.ShopAcceptanceVO;
import com.cool.store.vo.ShopStageAcceptanceVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author byd
@@ -54,4 +53,11 @@ public class OpenAcceptanceInfoController {
return ResponseResult.success(Boolean.TRUE);
}
@ApiOperation("开业验收-单项")
@PostMapping(path = "/acceptanceOne")
public ResponseResult<Boolean> acceptanceOne(@RequestBody ShopStageAcceptanceRequest shopStageAcceptanceRequest) {
openAcceptanceInfoService.acceptanceOne(shopStageAcceptanceRequest);
return ResponseResult.success(Boolean.TRUE);
}
}

33
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java Normal file
View File

@@ -0,0 +1,33 @@
package com.cool.store.controller.webb;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.CoolStoreStartFlowService;
import com.cool.store.service.YlfService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午4:19
* @Version 1.0
* @注释:
*/
@RestController
@RequestMapping("/pc/decoration")
@Api(tags = "PC装修阶段")
@Slf4j
public class PCDecorationController {
@Resource
private YlfService ylfService;
@GetMapping("/get")
private ResponseResult get(){
String shopCode = "31310383";
return new ResponseResult<>(200,ylfService.getProjectList(shopCode)) ;
}
}

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

@@ -35,7 +35,7 @@ public class PCTestController {
@GetMapping("/sendMessage")
public ResponseResult<Boolean> sendMessage(){
commonService.sendMessage(Arrays.asList("123836131931284423"), 1L, MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
commonService.sendMessage(Arrays.asList("123836131931284423"), MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
return ResponseResult.success(Boolean.FALSE);
}

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

@@ -2,7 +2,6 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PointService;