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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-06 17:32:56 +08:00
parent 2d0d896a58 5eebbc9cf3
commit 23f26ee0ed
13 changed files with 185 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java
View File

@@ -23,7 +23,7 @@ import javax.validation.Valid;
@Api(tags = "微信小程序app接口")
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/miniProgram" })
@RequestMapping({"/v1/partnerManage/miniProgram" })
public class MiniProgramAppController {
@Resource

13
coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
* @Version 1.0
*/
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/openArea" })
@RequestMapping({"/v1/partnerManage/openArea" })
@Slf4j
@Api(tags = "小程序开发区域城市")
public class OpenAreaController {
@@ -32,8 +32,7 @@ public class OpenAreaController {
@ApiImplicitParam(name = "parentId", value = "父区域名称", required = false),
@ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false)
})
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "parentId",required = false)Long parentId,
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId,
@RequestParam(value = "type",required = false)String type){
return ResponseResult.success();
@@ -45,8 +44,7 @@ public class OpenAreaController {
@ApiImplicitParams({
@ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false),
})
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "keyWord",required = false)String keyWord){
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaList(@RequestParam(value = "keyWord",required = false)String keyWord){
return ResponseResult.success();
@@ -55,8 +53,7 @@ public class OpenAreaController {
@GetMapping(path = "/getKeyOpenAreaList")
@ApiOperation("重点开放城市列表)")
public ResponseResult<PageInfo<OpenAreaVO>> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
public ResponseResult<PageInfo<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
return ResponseResult.success();
@@ -66,7 +63,7 @@ public class OpenAreaController {
@GetMapping(path = "/getOpenProvince")
@ApiOperation("可申请加盟省份/可预约加盟省份")
public ResponseResult<OpenProvinceVO> getOpenProvince(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
public ResponseResult<OpenProvinceVO> getOpenProvince(){
return ResponseResult.success();
}

48
coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
View File

@@ -22,7 +22,7 @@ import java.util.List;
* @Version 1.0
*/
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/partner" })
@RequestMapping({"/v1/partnerManage/partner" })
@Slf4j
@Api(tags = "加盟商信息")
public class PartnerController {
@@ -31,8 +31,7 @@ public class PartnerController {
@PostMapping(path = "/applyBaseInfo")
@ApiOperation("提交基本信息")
public ResponseResult<Boolean> applyBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody BaseUserInfoRequest baseUserInfoRequest){
public ResponseResult<Boolean> applyBaseInfo(@RequestBody BaseUserInfoRequest baseUserInfoRequest){
return ResponseResult.success();
}
@@ -40,7 +39,7 @@ public class PartnerController {
@GetMapping(path = "/getSubmitIntentionApplyFlag")
@ApiOperation("获取提交意向申请标识 true 已提交 false 未提交")
public ResponseResult<Boolean> getSubmitIntentionApplyFlag(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
public ResponseResult<Boolean> getSubmitIntentionApplyFlag(){
return ResponseResult.success();
@@ -52,8 +51,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "idCard", value = "身份证号码", required = false),
})
public ResponseResult<Boolean> getLineByIdCard(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "idCard",required = false)String idCard){
public ResponseResult<Boolean> getLineByIdCard(@RequestParam(value = "idCard",required = false)String idCard){
return ResponseResult.success();
@@ -66,8 +64,7 @@ public class PartnerController {
@ApiImplicitParam(name = "idCard", value = "身份证号码", required = false),
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<Boolean> changeBinding(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "idCard",required = false)String idCard,
public ResponseResult<Boolean> changeBinding(@RequestParam(value = "idCard",required = false)String idCard,
@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
@@ -76,8 +73,7 @@ public class PartnerController {
@PostMapping(path = "/submitPartnerBaseInfo")
@ApiOperation("提交加盟商基本信息")
public ResponseResult<Boolean> submitPartnerBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerBaseInfoRequest PartnerBaseInfoRequest){
public ResponseResult<Boolean> submitPartnerBaseInfo(@RequestBody PartnerBaseInfoRequest PartnerBaseInfoRequest){
//前提 未提交加盟申请
//成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域
@@ -86,8 +82,7 @@ public class PartnerController {
@PostMapping(path = "/submitPartnerClerkInfo")
@ApiOperation("提交加盟商店员信息")
public ResponseResult<Boolean> submitPartnerClerkInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){
public ResponseResult<Boolean> submitPartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){
return ResponseResult.success();
}
@@ -95,8 +90,7 @@ public class PartnerController {
@PostMapping(path = "/submitPartnerIntentInfo")
@ApiOperation("提交加盟商意向信息/行业认知")
public ResponseResult<Boolean> submitPartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
public ResponseResult<Boolean> submitPartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
return ResponseResult.success();
}
@@ -105,8 +99,7 @@ public class PartnerController {
@PostMapping(path = "/changePartnerClerkInfo")
@ApiOperation("修改加盟商店员信息")
public ResponseResult<Boolean> changePartnerClerkInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){
public ResponseResult<Boolean> changePartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){
return ResponseResult.success();
}
@@ -114,8 +107,7 @@ public class PartnerController {
@PostMapping(path = "/changePartnerIntentInfo")
@ApiOperation("修改加盟商意向信息/行业认知")
public ResponseResult<Boolean> changePartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
public ResponseResult<Boolean> changePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
return ResponseResult.success();
}
@@ -123,13 +115,12 @@ public class PartnerController {
@GetMapping(path = "/getPartnerLinBaseInfo")
@GetMapping(path = "/getPartnerLineBaseInfo")
@ApiOperation("查询加盟商线索详情(适用全部流程) 包括冷静期是否首次登录")
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "C端用户基本信息ID", required = false),
})
public ResponseResult<PartnerLineBaseInfoVO> getPartnerLinBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "partnerId",required = false)Long partnerId){
public ResponseResult<PartnerLineBaseInfoVO> getPartnerLinBaseInfo(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();
@@ -142,8 +133,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerBaseInfoVO> queryPartnerBaseInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
public ResponseResult<PartnerBaseInfoVO> queryPartnerBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
@@ -155,8 +145,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<List<PartnerClerkVO>> queryPartnerClerkInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
public ResponseResult<List<PartnerClerkVO>> queryPartnerClerkInfo(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
@@ -168,8 +157,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerIntentInfoVO> queryPartnerIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
public ResponseResult<PartnerIntentInfoVO> queryPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
@@ -183,8 +171,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "加盟商ID", required = false),
})
public ResponseResult<Boolean> completeJoinNotice(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "partnerId",required = false)Long partnerId){
public ResponseResult<Boolean> completeJoinNotice(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();
@@ -196,8 +183,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "加盟商ID", required = false),
})
public ResponseResult<Boolean> queryJoinNotice(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "partnerId",required = false)Long partnerId){
public ResponseResult<Boolean> queryJoinNotice(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();