From 98c01656d91ef8e993f90c7f0a25ad2738e44f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=8F=E4=BC=BD?= Date: Thu, 19 Oct 2023 15:37:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=81=E6=B5=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyPartnerLineInfoDAO.java | 11 +++-- .../store/mapper/HyPartnerLineInfoMapper.java | 11 ++++- .../request/PrivateSeaLineListRequest.java | 42 +++++++++---------- .../impl/HyPartnerLineInfoServiceImpl.java | 5 ++- 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 3dc7b01d0..9ddb6e6c1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -2,16 +2,12 @@ package com.cool.store.dao; import cn.hutool.core.map.MapUtil; import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.partner.PartnerBlackListDTO; -import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; -import com.cool.store.dto.partner.StageCountDTO; import com.cool.store.dto.partner.*; import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; -import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -139,9 +135,12 @@ public class HyPartnerLineInfoDAO { public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd, String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList, - List developmentManagerList,List userPortraitIdList,List userChannelIdList, String updateStartTime, String updateEndTime){ + List developmentManagerList,List userPortraitIdList,List userChannelIdList, String updateStartTime, String updateEndTime + ,String partnerName,String partnerMobile,String investmentManagerId,String userPortraitQueryType + ,String intentAreaId,String intentAreaQueryType,String lineStartTime,String lineEndTime,String userChannelQueryType){ return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, - intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList, updateStartTime, updateEndTime); + intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList, updateStartTime, updateEndTime + ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaId,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index 60a938729..c53be3997 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -181,7 +181,16 @@ public interface HyPartnerLineInfoMapper { @Param("userPortraitIdList") List userPortraitIdList, @Param("userChannelIdList") List userChannelIdList, @Param("updateStartTime") String updateStartTime, - @Param("updateEndTime") String updateEndTime); + @Param("updateEndTime") String updateEndTime, + @Param("partnerName") String partnerName, + @Param("partnerMobile") String partnerMobile, + @Param("investmentManagerId") String investmentManagerId, + @Param("userPortraitQueryType") String userPortraitQueryType, + @Param("intentAreaId") String intentAreaId, + @Param("intentAreaQueryType") String intentAreaQueryType, + @Param("lineStartTime") String lineStartTime, + @Param("lineEndTime") String lineEndTime, + @Param("userChannelQueryType") String userChannelQueryType); /** diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java index 84f2da6f2..968019d1d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java @@ -39,6 +39,21 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("调剂方式") private Integer acceptAdjustType; + @ApiModelProperty("加盟商姓名") + private String partnerName; + + @ApiModelProperty("加盟商手机号") + private String partnerMobile; + + @ApiModelProperty("招商经理ID") + private String investmentManagerId; + + @ApiModelProperty("意向区域（type为空的时候不需要传值）") + private String intentAreaId; + + @ApiModelProperty("意向区域 包含-contains/不包含-notContains/为空-blank") + private String intentAreaQueryType; + @ApiModelProperty("【推荐店铺编码】、【推荐店铺名称】、【加盟商姓名】或【手机号】") private String storeKeyword; @ApiModelProperty("【storeCode -推荐店铺编码】、【storeName 推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile 手机号】") @@ -47,41 +62,26 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("用户画像ID列表(type为空的时候不需要传值)") private List userPortraitIdList; + @ApiModelProperty("用户画像 包含-contains/不包含-notContains/为空-blank") + private String userPortraitQueryType; + @ApiModelProperty("线索来源ID列表(type为空的时候不需要传值)") private List userChannelIdList; + @ApiModelProperty("线索来源 包含-contains/不包含-notContains/为空-blank") + private String userChannelQueryType; + @ApiModelProperty("更新开始时间") private String updateStartTime; @ApiModelProperty("更新结束时间") private String updateEndTime; - @ApiModelProperty("线索姓名") - private String partnerName; - - @ApiModelProperty("线索手机号") - private String partnerMobile; - - @ApiModelProperty("招商经理ID") - private String investmentManagerId; - - @ApiModelProperty("包含-contains/不包含-notContains/为空-blank") - private String userPortraitQueryType; - - @ApiModelProperty("意向开店区域（type为空的时候不需要传值）") - private String intentAreaId; - - @ApiModelProperty("包含-contains/不包含-notContains/为空-blank") - private String intentAreaQueryType; - @ApiModelProperty("创建时间_开始") private String lineStartTime; @ApiModelProperty("创建时间_结束") private String lineEndTime; - @ApiModelProperty("包含-contains/不包含-notContains/为空-blank") - private String userChannelQueryType; - } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 28e289ec7..9ce6c0c20 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -2,7 +2,6 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.constants.RedisConstant; @@ -630,7 +629,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { PageHelper.startPage(request.getPageNum(),request.getPageSize()); PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(), request.getKeywordType(), request.getWorkflowStage(), request.getWorkflowStatus(), request.getDeadlineStart(), request.getDeadlineEnd(), intentAreaName, request.getAcceptAdjustType(), request.getStoreKeyword(), - request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList(),request.getUserChannelIdList(), request.getUpdateStartTime(), request.getUpdateEndTime())); + request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList(),request.getUserChannelIdList(), request.getUpdateStartTime(), request.getUpdateEndTime(), + request.getPartnerName(),request.getPartnerMobile(),request.getInvestmentManagerId(),request.getUserPortraitQueryType() + ,request.getIntentAreaId(),request.getIntentAreaQueryType(),request.getLineStartTime(),request.getLineEndTime(),request.getUserChannelQueryType())); List list = privateLineList.getList(); if (CollectionUtils.isEmpty(list)){ return privateLineList;