From 6929b9046ee44c0bbaaf96c98b05768b2088f3f4 Mon Sep 17 00:00:00 2001 From: guohb Date: Mon, 15 Apr 2024 18:07:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?FIX:oa=E6=8B=92=E7=BB=9D=E6=97=A0=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IntentAgreementServiceImpl.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 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 2cbfbcfbf..01862ce2f 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 @@ -139,14 +139,13 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); //更新线索阶段 lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(),userId); - //更新auditId - SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfo.getId()); - if (Objects.nonNull(signingBaseInfoDO)) { - intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId); - } else { - throw new ServiceException("无法更新,没有对应的签约基本信息"); - } - + } + //更新auditId + SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfo.getId()); + if (Objects.nonNull(signingBaseInfoDO)) { + intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId); + } else { + throw new ServiceException("无法更新,没有对应的签约基本信息"); } return Boolean.TRUE; } @@ -168,9 +167,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_80.getCode()); lineInfo.setUpdateUserId(userId); lineInfoDAO.updateLineInfo(lineInfo); - //更新auditId - intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId); } + //更新auditId + intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId); return Boolean.TRUE; } From b23434d2ca69d7a96c98528db79cd832be23a498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 15 Apr 2024 19:39:08 +0800 Subject: [PATCH 2/4] bug --- .../java/com/cool/store/service/impl/LineServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 aedb09637..f2cd64c0a 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 @@ -381,7 +381,7 @@ public class LineServiceImpl implements LineService { } hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); hyPartnerUserInfoDO.setMobile(addLineRequest.getMobile()); - hyPartnerUserInfoDO.setUserChannelId(Integer.getInteger(UserChannelEnum.ADD.getCode())); + hyPartnerUserInfoDO.setUserChannelId(Integer.valueOf(UserChannelEnum.ADD.getCode())); hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); LineInfoDO lineInfoDO = new LineInfoDO(); @@ -392,7 +392,7 @@ public class LineServiceImpl implements LineService { lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode()); lineInfoDO.setWantShopAreaId(addLineRequest.getWantShopAreaId()); lineInfoDO.setUsername(addLineRequest.getUserName()); - lineInfoDO.setLineSource(Integer.getInteger(UserChannelEnum.ADD.getCode())); + lineInfoDO.setLineSource(Integer.valueOf(UserChannelEnum.ADD.getCode())); lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); String userId = null; if (addLineRequest.getInvestmentManagerUserId()!=null){ From bfc40bc4d29c4a9962677815f68db8612689695d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 16 Apr 2024 11:03:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f2cd64c0a..d5a6a6643 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 @@ -277,7 +277,7 @@ public class LineServiceImpl implements LineService { if (lineInfo==null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } - if (lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())){ + if (!lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())){ throw new ServiceException(ErrorCodeEnum.NOT_IN_PUBLIC_SEA); } if (lineInfo.getInvestmentManager().equals(changeInvestmentRequest.getInvestmentManagerId())){ From 1ab170b14b7413d609cdb56637660a722bc97bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 16 Apr 2024 11:48:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=AC=E8=AE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5a6a6643..882536bbc 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 @@ -277,7 +277,7 @@ public class LineServiceImpl implements LineService { if (lineInfo==null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } - if (!lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())){ + if (!lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())&&!transferFlag){ throw new ServiceException(ErrorCodeEnum.NOT_IN_PUBLIC_SEA); } if (lineInfo.getInvestmentManager().equals(changeInvestmentRequest.getInvestmentManagerId())){