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:
zhangchenbiao
2024-04-10 17:24:44 +08:00
parent fa18c4c476 3316ab608b
commit dff0042b54
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import com.cool.store.request.FranchiseeSaveRequest;
import com.cool.store.request.InitiatingRequest;
import com.cool.store.request.IntentAgreementSubmitRequest;
import com.cool.store.response.InitiatingResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.SigningBaseInfoResponse;
public interface IntentAgreementService {
@@ -22,7 +23,7 @@ public interface IntentAgreementService {
*/
SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId);
InitiatingResponse initiating(InitiatingRequest request);
ResponseResult initiating(InitiatingRequest request);
InitiatingResponse save(FranchiseeSaveRequest request);
ResponseResult save(FranchiseeSaveRequest request);
}

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

@@ -17,6 +17,7 @@ import com.cool.store.request.FranchiseeSaveRequest;
import com.cool.store.request.InitiatingRequest;
import com.cool.store.request.IntentAgreementSubmitRequest;
import com.cool.store.response.InitiatingResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.SigningBaseInfoResponse;
import com.cool.store.service.IntentAgreementService;
import com.cool.store.utils.SecureUtil;
@@ -176,7 +177,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
}
@Override
public InitiatingResponse initiating(InitiatingRequest request) {
public ResponseResult initiating(InitiatingRequest request) {
log.info("initiating request:{}", JSONObject.toJSONString(request));
if (Objects.isNull(request)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
@@ -189,14 +190,17 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
initiatingDO.setKdzBusinessId(lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus());
InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class);
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
return initiatingResponse;
if (initiatingResponse.getCode() != 0L){
return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData());
}else {
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData());
}
}
@Override
public InitiatingResponse save(FranchiseeSaveRequest request) {
public ResponseResult save(FranchiseeSaveRequest request) {
log.info("save request:{}", JSONObject.toJSONString(request));
if (Objects.isNull(request)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
@@ -231,8 +235,11 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
lineInfoParam.setPartnerNum(initiatingResponse.getData());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoParam);
}
return initiatingResponse;
if (initiatingResponse.getCode() != 0){
return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData());
}else {
return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData());
}
}
private void fillSignatureInfo(Map<String, Object> requestMap) {

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
View File

@@ -15,6 +15,7 @@ import com.cool.store.request.JoinIntentionRequest;
import com.cool.store.service.JoinIntentionService;
import com.cool.store.service.OpenAreaService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.PartnerBaseInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -54,6 +55,9 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
@Resource
RegionAreaConfigDao regionAreaConfigDao;
@Resource
LineInfoMapper lineInfoMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public boolean submit(JoinIntentionRequest request) {
@@ -69,7 +73,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
if (Objects.isNull(lineInfoParam)) {
throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST);
}
if (Objects.nonNull(request.getAreaCode())){
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))){
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, Long.valueOf(request.getAreaCode()));
lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -388,6 +388,7 @@ public class LineServiceImpl implements LineService {
lineInfoDO.setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode());
lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
lineInfoDO.setMobile(addLineRequest.getMobile());
lineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode());
lineInfoDO.setWantShopAreaId(addLineRequest.getWantShopAreaId());
lineInfoDO.setUsername(addLineRequest.getUserName());

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

@@ -33,13 +33,13 @@ public class PCIntentAgreementController {
@PostMapping(path = "/initiating")
@ApiOperation("kdz -> xfsg 发起意向协议流程")
public InitiatingResponse initiating(@RequestBody InitiatingRequest request) {
public ResponseResult initiating(@RequestBody InitiatingRequest request) {
return intentAgreementService.initiating(request);
}
@PostMapping(path = "/franchisee/save")
@ApiOperation("kdz -> xfsg 加盟商新增")
public InitiatingResponse save(@RequestBody FranchiseeSaveRequest request) {
public ResponseResult save(@RequestBody FranchiseeSaveRequest request) {
return intentAgreementService.save(request);
}