diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java index 84fa4e2ba..7c7f6cdef 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java @@ -113,9 +113,6 @@ public class InitiatingRequest { // 格式化日期并输出 String dateTime = currentDate.format(formatter); initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime); - //todo 暂时写死,后续用UserHolder - initiatingDO.setApply_user("22090043"); - initiatingDO.setApply_user_name("22090043"); initiatingDO.setApply_date(this.apply_date); initiatingDO.setJms_id_card(this.idCardNo); if (StringUtil.isNotBlank(this.businessLicenseAddress)){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java index e6e018c46..b3c247547 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java @@ -24,7 +24,7 @@ public interface IntentAgreementService { */ SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId); - ResponseResult initiating(InitiatingRequest request); + ResponseResult initiating(InitiatingRequest request,LoginUserInfo user); ResponseResult save(FranchiseeSaveRequest request, LoginUserInfo user); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 4df901a49..f911acd79 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -171,7 +171,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten @Override - public ResponseResult initiating(InitiatingRequest request) { + public ResponseResult initiating(InitiatingRequest request,LoginUserInfo user) { log.info("initiating request:{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -180,6 +180,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten fillSignatureInfo(requestMap); String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); InitiatingDO initiatingDO = request.toInitiatingDO(); + //todo 暂时写死,后续用UserHolder + initiatingDO.setApply_user("22090043"); + initiatingDO.setApply_user_name("22090043"); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); initiatingDO.setKdzBusinessId(AuditEnum.CONTRACT_INTENTION.getCode() + "_" + lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus()); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java index af6dc737b..448629220 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java @@ -36,7 +36,8 @@ public class PCIntentAgreementController { @PostMapping(path = "/initiating") @ApiOperation("kdz -> xfsg 发起意向协议流程") public ResponseResult initiating(@RequestBody InitiatingRequest request) { - return intentAgreementService.initiating(request); + LoginUserInfo user = CurrentUserHolder.getUser(); + return intentAgreementService.initiating(request,user); } @PostMapping(path = "/franchisee/save")