From 372db69e65b63d5c8aadd152f628e55e0ad0a78a Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 16:29:33 +0800 Subject: [PATCH 1/5] ResponseResult --- .../store/service/IntentAgreementService.java | 5 +++-- .../impl/IntentAgreementServiceImpl.java | 19 +++++++++++++------ .../webb/PCIntentAgreementController.java | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) 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 b3e4ab378..f2981201c 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 @@ -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); } 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 14ea59ed1..0c49dd619 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 @@ -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); @@ -191,12 +192,15 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class); lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode()); lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO); - return initiatingResponse; - + if (initiatingResponse.getCode() != 0){ + return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData()); + }else { + 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 requestMap) { 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 879076fb7..2b6bd9fa3 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 @@ -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); } From c84396170f9cd17f8fd18854278f68668150ac3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 10 Apr 2024 16:35:38 +0800 Subject: [PATCH 2/5] getByLineId --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index e54a6fd57..24ddb8993 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -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()); From fdeb5ac97fca31e4a1a0c43a44a29fbddcaa657e Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 16:40:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8B=9B=E5=95=86=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E4=B8=8D=E9=87=8D=E6=96=B0=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/JoinIntentionServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index c1db681fb..ad0199b8e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -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())){ EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, Long.valueOf(request.getAreaCode())); lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); } From c2465368b62f9b29640f7c59e317c4ef00bdbb89 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 16:48:01 +0800 Subject: [PATCH 4/5] initiating --- .../cool/store/service/impl/IntentAgreementServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0c49dd619..5dca7a4db 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 @@ -190,11 +190,11 @@ 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); if (initiatingResponse.getCode() != 0){ 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()); } } From 3316ab608b26c58ebbce4a7b151252897f3bf255 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 17:14:47 +0800 Subject: [PATCH 5/5] initiating --- .../com/cool/store/service/impl/IntentAgreementServiceImpl.java | 2 +- .../com/cool/store/service/impl/JoinIntentionServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5dca7a4db..dab08e12a 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 @@ -190,7 +190,7 @@ 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); - if (initiatingResponse.getCode() != 0){ + if (initiatingResponse.getCode() != 0L){ return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData()); }else { lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index ad0199b8e..7f330eb2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -74,7 +74,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); } LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); - if (Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())){ + 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()); }