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

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

Browse Source
This commit is contained in:
bianyadong
2024-05-09 13:42:31 +08:00
parent 57a6fce644 8bf497b2a4
commit 8d3908be58
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java
View File

@@ -113,9 +113,6 @@ public class InitiatingRequest {
// 格式化日期并输出 // 格式化日期并输出
String dateTime = currentDate.format(formatter); String dateTime = currentDate.format(formatter);
initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime); initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime);
//todo 暂时写死，后续用UserHolder
initiatingDO.setApply_user("22090043");
initiatingDO.setApply_user_name("22090043");
initiatingDO.setApply_date(this.apply_date); initiatingDO.setApply_date(this.apply_date);
initiatingDO.setJms_id_card(this.idCardNo); initiatingDO.setJms_id_card(this.idCardNo);
if (StringUtil.isNotBlank(this.businessLicenseAddress)){ if (StringUtil.isNotBlank(this.businessLicenseAddress)){

2
coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java
View File

@@ -24,7 +24,7 @@ public interface IntentAgreementService {
*/ */
SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId); SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId);
ResponseResult initiating(InitiatingRequest request); ResponseResult initiating(InitiatingRequest request,LoginUserInfo user);
ResponseResult save(FranchiseeSaveRequest request, LoginUserInfo user); ResponseResult save(FranchiseeSaveRequest request, LoginUserInfo user);

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -171,7 +171,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
@Override @Override
public ResponseResult initiating(InitiatingRequest request) { public ResponseResult initiating(InitiatingRequest request,LoginUserInfo user) {
log.info("initiating request:{}", JSONObject.toJSONString(request)); log.info("initiating request:{}", JSONObject.toJSONString(request));
if (Objects.isNull(request)) { if (Objects.isNull(request)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
@@ -180,6 +180,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
fillSignatureInfo(requestMap); fillSignatureInfo(requestMap);
String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature");
InitiatingDO initiatingDO = request.toInitiatingDO(); InitiatingDO initiatingDO = request.toInitiatingDO();
//todo 暂时写死，后续用UserHolder
initiatingDO.setApply_user("22090043");
initiatingDO.setApply_user_name("22090043");
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
initiatingDO.setKdzBusinessId(AuditEnum.CONTRACT_INTENTION.getCode() + "_" + lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus()); initiatingDO.setKdzBusinessId(AuditEnum.CONTRACT_INTENTION.getCode() + "_" + lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus());
InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class);

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

@@ -36,7 +36,8 @@ public class PCIntentAgreementController {
@PostMapping(path = "/initiating") @PostMapping(path = "/initiating")
@ApiOperation("kdz -> xfsg 发起意向协议流程") @ApiOperation("kdz -> xfsg 发起意向协议流程")
public ResponseResult initiating(@RequestBody InitiatingRequest request) { public ResponseResult initiating(@RequestBody InitiatingRequest request) {
return intentAgreementService.initiating(request); LoginUserInfo user = CurrentUserHolder.getUser();
return intentAgreementService.initiating(request,user);
} }
@PostMapping(path = "/franchisee/save") @PostMapping(path = "/franchisee/save")