From afa5cd4146e91f6f82356c9e874795bf585d8069 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 4 Jun 2024 09:41:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E9=80=89?= =?UTF-8?q?=E6=88=98=E5=8C=BA=202.=E6=9F=A5=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=A4=A7=E5=8C=BAregionId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/request/AuditPassRequest.java | 3 +++ .../src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java | 2 ++ .../com/cool/store/service/impl/JoinIntentionServiceImpl.java | 1 + .../main/java/com/cool/store/service/impl/LineFlowService.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java index 23e851ec2..dca04c48c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java @@ -26,4 +26,7 @@ public class AuditPassRequest { @ApiModelProperty("通过原因") private String passReason; + @ApiModelProperty("战区regionId,只在意向加盟申请阶段使用") + private Long fightRegion; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java index dfa54d416..f56bfeeec 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java @@ -68,6 +68,8 @@ public class PartnerBaseInfoVO { @ApiModelProperty("公开拒绝原因") private String rejectPublicReason; + @ApiModelProperty("大区regionId") + private Long bigRegionId; 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 ccd2ac794..c7870b56f 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 @@ -142,6 +142,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt } response.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason()); } + response.setBigRegionId(byLineId.getRegionId()); return response; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java index e346d3c40..14f48497a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java @@ -47,6 +47,8 @@ public abstract class LineFlowService { if(!lineInfo.getWorkflowSubStage().equals(request.getWorkflowSubStage())){ throw new ServiceException(ErrorCodeEnum.WORK_FLOW_STAGE_PASS_ERROR); } + lineInfo.setRegionId(request.getFightRegion()); + Integer updateFlag = lineInfoDAO.updateLineInfo(lineInfo); String partnerId = lineInfo.getPartnerId(); LineAuditInfoDO auditInfo = new LineAuditInfoDO(); auditInfo.setLineId(request.getLineId());