From b35da87d741b6c622043e4c3c3d3952a6a37f275 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 3 Apr 2024 15:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=84=8F=E5=90=91=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/InitiatingRequest.java | 7 ++++--- .../store/service/impl/IntentAgreementServiceImpl.java | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) 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 d43a1a740..58ea9934d 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 @@ -109,8 +109,9 @@ public class InitiatingRequest { // 格式化日期并输出 String dateTime = currentDate.format(formatter); initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime); - initiatingDO.setApply_user(this.apply_user); - initiatingDO.setApply_user_name(this.signName); + //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)){ @@ -123,7 +124,7 @@ public class InitiatingRequest { }else if (StringUtil.isNotBlank(this.idCardNo)){ initiatingDO.setJms_id_card(this.idCardNo); } - initiatingDO.setJms_name(this.jms_name); + initiatingDO.setJms_name(this.signName); initiatingDO.setLybzj(this.lybzj); initiatingDO.setLybzjwb(this.lybzj); initiatingDO.setLybzjdx(this.lybzjdx); 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 542c6200a..c74503031 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 @@ -1,6 +1,8 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.LineInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; @@ -177,6 +179,7 @@ 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(); +// LoginUserInfo user = CurrentUserHolder.getUser(); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); initiatingDO.setKdzBusinessId(lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus()); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class);