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

发起意向协议流程

Browse Source
This commit is contained in:
guohb
2024-04-03 15:44:25 +08:00
parent ef696c397a
commit b35da87d74
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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);