From df256f690201d9d0c8c714630a8a3368bc426014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Apr 2024 10:45:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E8=AE=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyContentInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml index a306a9b2b..d980fbed8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml @@ -169,14 +169,14 @@ From b9c2947a0840808a7de9d568510d1818516f295b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Apr 2024 11:09:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/mapper/JoinIntentionMapper.java | 6 +++++- .../main/resources/mapper/JoinIntentionMapper.xml | 12 ++++++++++++ .../src/main/java/com/cool/store/vo/BaseInfoVO.java | 4 ++++ .../src/main/java/com/cool/store/vo/LineInfoVO.java | 3 +++ .../com/cool/store/service/impl/LineServiceImpl.java | 8 ++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java index e12b95973..015f9923e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java @@ -5,10 +5,14 @@ import com.cool.store.vo.PartnerBaseInfoVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface JoinIntentionMapper { boolean insertOrUpdate(@Param("request") MemberQuestionDO request); - MemberQuestionDO getByLineId(@Param("lineId") Long lineId); + MemberQuestionDO getByLineId(@Param("lineId") Long lineId); + + List getByLineIds(@Param("lineIds") List lineIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml index 370e1a400..475dfe15c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml @@ -113,5 +113,17 @@ and deleted = 0 + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java index 640230f7e..3daad6ac6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java @@ -34,6 +34,9 @@ public class BaseInfoVO { @ApiModelProperty("线索标签") private List userPortraitList; + @ApiModelProperty("流程阶段:1意向加盟;2新店进展;") + private Integer workflowStage; + private Integer workflowSubStage; @ApiModelProperty("子阶段状态") @@ -53,6 +56,7 @@ public class BaseInfoVO { this.workflowSubStage = baseInfoVO.getWorkflowSubStage(); this.wantShopAreaName = baseInfoVO.getWantShopAreaName(); this.userPortraitList = baseInfoVO.getUserPortraitList(); + this.workflowStage = baseInfoVO.getWorkflowStage(); this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus(); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java index ff0695d70..edb4f62a9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java @@ -82,6 +82,9 @@ public class LineInfoVO { @ApiModelProperty("流程阶段:1意向加盟;2新店进展;") private Integer workflowStage; + @ApiModelProperty("加盟身份 1个人加盟 2企业加盟") + private Integer joinType; + /** * 流程子阶段 */ 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 df1f9156a..26f3ff70c 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 @@ -9,6 +9,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.IntentAgreementMapper; +import com.cool.store.mapper.JoinIntentionMapper; import com.cool.store.mapper.RegionMapper; import com.cool.store.request.*; import com.cool.store.service.*; @@ -56,6 +57,8 @@ public class LineServiceImpl implements LineService { TransferLogService transferLogService; @Resource IntentAgreementMapper intentAgreementMapper; + @Resource + JoinIntentionMapper joinIntentionMapper; @Override public LineInfoVO getLineInfo(Long lineId) { @@ -82,11 +85,16 @@ public class LineServiceImpl implements LineService { result.setLargeRegionId(bigRegionIdByAreaId); result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId)); } + + MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfo.getId()); Map userPortraitMap = deskService.getUserPortraitMap(Arrays.asList(lineInfo)); Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(Arrays.asList(lineInfo.getWantShopAreaId())); BaseInfoVO baseInfoVO = deskService.convertToBaseInfoVO(lineInfo, userPortraitMap, wantShopAreaMap); result.setWantShopAreaName(baseInfoVO.getWantShopAreaName()); result.setUserPortraitList(baseInfoVO.getUserPortraitList()); + if (memberQuestionDO != null){ + result.setJoinType(memberQuestionDO.getJoinType()); + } BeanUtil.copyProperties(lineInfo,result); return result; }