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

update

Browse Source
This commit is contained in:
zhangchenbiao
2023-05-31 16:47:04 +08:00
parent b00a91d060
commit 5070f52076
19 changed files with 319 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-webc/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -97,7 +97,7 @@ public class TokenValidateFilter implements Filter {
ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID)));
return;
}
log.info("url:{}, access_token:{}, userId:{}, username:{}, enterpriseId:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName(), currentUser.getEnterpriseId());
log.info("url:{}, accessToken:{}, userId:{}, username:{}, enterpriseId:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName(), currentUser.getEnterpriseId());
}
if(StringUtils.isBlank(userStr) && !isInWhiteList){
response.setStatus(HttpStatus.OK.value());

6
coolstore-partner-webc/src/main/java/com/cool/store/config/swagger/Swagger2Config.java
View File

@@ -72,11 +72,11 @@ public class Swagger2Config {
private List<Parameter> getParameters() {
List<Parameter> pars = new ArrayList<>();
pars.add(new ParameterBuilder().name("access_token").description("令牌").required(true)
pars.add(new ParameterBuilder().name("accessToken").description("令牌").required(true)
.modelRef(new ModelRef("string"))
.defaultValue("{{access_token}}")
.defaultValue("{{accessToken}}")
.parameterType("query").build());
pars.add(new ParameterBuilder().name("enterprise-id").required(true)
pars.add(new ParameterBuilder().name("enterpriseId").required(true)
.modelRef(new ModelRef("string"))
.defaultValue("45f92210375346858b6b6694967f44de")
.parameterType("path").build());

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/{enterprise-id}/miniProgram" })
@RequestMapping({"/v1/partnerManage/{enterpriseId}/miniProgram" })
public class MiniProgramAppController {
@Resource

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
* @Version 1.0
*/
@RestController
@RequestMapping({"/v1/partnerManage/{enterprise-id}/openArea" })
@RequestMapping({"/v1/partnerManage/{enterpriseId}/openArea" })
@Slf4j
public class OpenAreaController {
@@ -31,7 +31,7 @@ public class OpenAreaController {
@ApiImplicitParam(name = "pageNumber", value = "页码", required = false),
@ApiImplicitParam(name = "pageSize", value = "分页大小", required = false)
})
public ResponseResult<PageInfo<OpenAreaVO>> getOpenAreaList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PageInfo<OpenAreaVO>> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "keyOpenFlag",required = false)Boolean keyOpenFlag,
@RequestParam(value = "parentId",required = false)Long parentId,
@RequestParam(value = "type",required = false)String type,
@@ -44,7 +44,7 @@ public class OpenAreaController {
@GetMapping(path = "/getOpenProvince")
@ApiOperation("可申请加盟省份/可预约加盟省份")
public ResponseResult<OpenProvinceVO> getOpenProvince(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){
public ResponseResult<OpenProvinceVO> getOpenProvince(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
return ResponseResult.success();
}

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

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
* @Version 1.0
*/
@RestController
@RequestMapping({"/v1/partnerManage/{enterprise-id}/partner" })
@RequestMapping({"/v1/partnerManage/{enterpriseId}/partner" })
@Slf4j
public class PartnerController {
@@ -28,7 +28,7 @@ public class PartnerController {
@PostMapping(path = "/applyBaseInfo")
@ApiOperation("提交基本信息")
public ResponseResult<Boolean> applyBaseInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> applyBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody BaseUserInfoRequest baseUserInfoRequest){
return ResponseResult.success();
@@ -37,7 +37,7 @@ public class PartnerController {
@PostMapping(path = "/changeBaseInfo")
@ApiOperation("变更基本信息")
public ResponseResult<Boolean> changeBaseInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> changeBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody BaseUserInfoRequest baseUserInfoRequest){
//前提 未提交加盟申请
@@ -48,7 +48,7 @@ public class PartnerController {
@GetMapping(path = "/getSubmitIntentionApplyFlag")
@ApiOperation("获取提交意向申请标识 true 已提交 false 未提交")
public ResponseResult<Boolean> getSubmitIntentionApplyFlag(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){
public ResponseResult<Boolean> getSubmitIntentionApplyFlag(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
return ResponseResult.success();
@@ -60,7 +60,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "idCard", value = "身份证号码", required = false),
})
public ResponseResult<Boolean> getLineByIdCard(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> getLineByIdCard(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "idCard",required = false)String idCard){
@@ -74,7 +74,7 @@ public class PartnerController {
@ApiImplicitParam(name = "idCard", value = "身份证号码", required = false),
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<Boolean> changeBinding(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> changeBinding(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "idCard",required = false)String idCard,
@RequestParam(value = "lineId",required = false)Long lineId){
@@ -85,7 +85,7 @@ public class PartnerController {
@PostMapping(path = "/submitPartnerSummaryInfo")
@ApiOperation("提交加盟商汇总信息")
public ResponseResult<Boolean> submitPartnerSummaryInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> submitPartnerSummaryInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerSummaryInfoRequest partnerSummaryInfo){
//前提 未提交加盟申请
@@ -97,7 +97,7 @@ public class PartnerController {
@PostMapping(path = "/changePartnerSummaryInfo")
@ApiOperation("修改加盟商汇总信息 修改意向信息 修改店员信息 修改行业认知")
public ResponseResult<Boolean> changePartnerSummaryInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> changePartnerSummaryInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PartnerSummaryInfoRequest partnerSummaryInfo){
//前提 未提交加盟申请
@@ -112,7 +112,7 @@ public class PartnerController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){