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

Merge #26 into master from cc_20260105_partner

Browse Source 
feat:测试

* cc_20260105_partner: (8 commits squashed)

  - feat:加盟商意向书字段调整

  - feat:意向审核

  - feat:加盟商意向申请

  - feat:新增其他备注

  - feat:返回信息缺失

  - feat:资质阶段审核完成才回成为加盟商

  - feat:大区查询阶段状态是6

  - feat:测试

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/26
This commit is contained in:
正新
2026-01-14 11:03:42 +00:00
parent 08845557fd
commit 82a49a03d2
16 changed files with 204 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,22 +27,22 @@ public class KdzApiController {
@Resource
KdzApiService kdzApiService;
@ApiOperation("审核结果")
@PostMapping("/audit/result")
public ResponseResult<Boolean> auditResult(@PathVariable(value = "enterprise-id") String eid,
@RequestBody XfsgOpenApiRequest request) {
log.info("auditResult requestBody :{}", JSONObject.toJSONString(request));
if (!verifyMD5(request, eid)) {
log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid);
return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);
}
if (eid == null || request.getBizContent() == null) {
log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent()));
return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class);
return ResponseResult.success(kdzApiService.auditResult(auditResultRequest));
}
// @ApiOperation("审核结果")
// @PostMapping("/audit/result")
// public ResponseResult<Boolean> auditResult(@PathVariable(value = "enterprise-id") String eid,
// @RequestBody XfsgOpenApiRequest request) {
// log.info("auditResult requestBody :{}", JSONObject.toJSONString(request));
// if (!verifyMD5(request, eid)) {
// log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid);
// return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);
// }
// if (eid == null || request.getBizContent() == null) {
// log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent()));
// return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
// }
// AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class);
// return ResponseResult.success(kdzApiService.auditResult(auditResultRequest));
// }
@ApiOperation("证照信息回调")
@PostMapping("/license")