From 1616aff2f8dd305daef541fa8915fe3d12265379 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 14:21:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?request=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/PrivateSeaLineListRequest.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) 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 8fa6bcec6..84f2da6f2 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 @@ -1,11 +1,9 @@ package com.cool.store.request; -import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.util.List; /** @@ -46,8 +44,10 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("【storeCode -推荐店铺编码】、【storeName 推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile 手机号】") private String storeKeywordType; + @ApiModelProperty("用户画像ID列表(type为空的时候不需要传值)") private List userPortraitIdList; + @ApiModelProperty("线索来源ID列表(type为空的时候不需要传值)") private List userChannelIdList; @ApiModelProperty("更新开始时间") @@ -56,5 +56,32 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @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; + } 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 2/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=81=E6=B5=B7?= =?UTF-8?q?=E6=9F=A5=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; From 82b63d6db0f8e787594a2efbfcaee00c610d6f3a 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 16:15:13 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E7=A7=81=E6=B5=B7=E5=88=97=E8=A1=A8sql=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerLineInfoMapper.xml | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 659199313..9ded68729 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -562,12 +562,30 @@ AND hpli.update_time BETWEEN #{updateStartTime} and #{updateEndTime} + + AND hpli.create_time BETWEEN #{lineStartTime} and #{lineEndTime} + and hoai.area_path like concat('%/',#{intentAreaName},'/%') AND hpuinfo.accept_adjust_type = #{acceptAdjustType} + + AND hpuinfo.username like concat('%',#{partnerName},'%') + + + AND hpuinfo.mobile like concat('%',#{partnerMobile},'%') + + + AND hpli.investment_manager = #{investmentManagerId} + + + AND hpuinfo.want_shop_area = #{intentAreaId} + + + AND hpuinfo.want_shop_area != #{intentAreaId} + AND hpuinfo.shop_code like concat('%',#{storeKeyword},'%') @@ -585,16 +603,26 @@ #{userId} - - - bi.user_portrait like concat("%,", #{userPortraitId}, ",%") + + + #{userPortraitId} - + + + #{userPortraitId} + + + #{userChannelId} + + + #{userChannelId} + + #{developmentManager} From 0ca28972527c77978cca76f946b02a0fb635fc43 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 17:19:30 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=84=E5=8F=8A?= =?UTF-8?q?=E5=AD=90=E6=A0=87=E7=AD=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/vo/LabelGroupListVo.java | 4 ++++ .../com/cool/store/service/LabelService.java | 2 ++ .../store/service/impl/LabelServiceImpl.java | 21 ++++++++++++++++++- .../store/controller/LabelController.java | 13 ++++++++---- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java index e7a109e41..c17c12106 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author Fun Li 2023/8/10 13:33 @@ -27,4 +28,7 @@ public class LabelGroupListVo { @ApiModelProperty("编辑时间") private Date editDate; + @ApiModelProperty("标签列表") + private List labelList; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java index 16b3d3a1f..9c73e01cd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java @@ -6,6 +6,7 @@ import com.cool.store.dto.label.LabelListDTO; import com.cool.store.dto.label.LabelUpdateDTO; import com.cool.store.entity.HyPartnerLabelDO; import com.cool.store.exception.ApiException; +import com.cool.store.vo.LabelGroupListVo; import com.cool.store.vo.LabelListVo; import java.util.List; @@ -61,4 +62,5 @@ public interface LabelService { void addEcLabel(HyPartnerLabelDO hyPartnerLabelDO); + List getAllGroupAndLabelList(); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java index dcdf395b8..dc673833c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java @@ -10,7 +10,9 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ApiException; import com.cool.store.mapper.HyPartnerLabelMapper; import com.cool.store.service.LabelService; +import com.cool.store.vo.LabelGroupListVo; import com.cool.store.vo.LabelListVo; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -18,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -116,6 +117,24 @@ public class LabelServiceImpl implements LabelService { labelMapper.insertSelective(hyPartnerLabelDO); } + @Override + public List getAllGroupAndLabelList() { + List labelList = labelMapper.getLabelList(new LabelListDTO()); + if (CollectionUtils.isEmpty(labelList)) { + log.info("标签列表为空"); + return Lists.newArrayList(new LabelGroupListVo()); + } + Map> idForVo = labelList.stream().collect(Collectors.groupingBy(LabelListVo::getLabelGroupId)); + List result = idForVo.entrySet().stream().map(entry -> { + LabelGroupListVo labelGroupListVo = new LabelGroupListVo(); + labelGroupListVo.setId(entry.getKey()); + labelGroupListVo.setLabelGroupName(entry.getValue().get(0).getLabelGroupName()); + labelGroupListVo.setLabelList(entry.getValue()); + return labelGroupListVo; + }).sorted(Comparator.comparing(LabelGroupListVo::getId)).collect(Collectors.toList()); + return result; + } + private Boolean whetherLabelRepeat(HyPartnerLabelDO label) throws ApiException { Long id = label.getId(); label.setId(null); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java index ac950909f..f6599cdaa 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java @@ -7,16 +7,14 @@ import com.cool.store.dto.label.LabelUpdateDTO; import com.cool.store.exception.ApiException; import com.cool.store.response.ResponseResult; import com.cool.store.service.LabelService; +import com.cool.store.vo.LabelGroupListVo; import com.cool.store.vo.LabelListVo; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -40,6 +38,13 @@ public class LabelController { return ResponseResult.success(new PageInfo<>(result)); } + @ApiOperation("查询标签组及子标签列表") + @GetMapping("/labelGroupAndLabelList") + public ResponseResult> getAllLabelList() { + List result = labelService.getAllGroupAndLabelList(); + return ResponseResult.success(result); + } + @ApiOperation("新增标签") @PostMapping("/add") public ResponseResult addLabel(@RequestBody LabelAddDTO dto) throws ApiException { From ac68c59ab4f290a660d202c381c345504cf7bef6 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 17:33:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9Fid?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/HyPartnerLineInfoDAO.java | 4 ++-- .../com/cool/store/mapper/HyPartnerLineInfoMapper.java | 1 - .../com/cool/store/request/PrivateSeaLineListRequest.java | 3 --- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 8 ++++---- 4 files changed, 6 insertions(+), 10 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 9ddb6e6c1..b334b8542 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 @@ -137,10 +137,10 @@ public class HyPartnerLineInfoDAO { String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList, 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){ + ,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 - ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaId,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType); + ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,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 c53be3997..1f2453282 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 @@ -186,7 +186,6 @@ public interface HyPartnerLineInfoMapper { @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, 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 968019d1d..81b9e74f4 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 @@ -33,9 +33,6 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("截止时间_结束") private String deadlineEnd; - @ApiModelProperty("意向区域") - private String intentArea; - @ApiModelProperty("调剂方式") private Integer acceptAdjustType; 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 9ce6c0c20..2520f62f5 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 @@ -625,13 +625,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { if (!allPrivateSeaFlag){ userIdsByScope = enterpriseUserService.getUserIdsByScope(userId); } - String intentAreaName = getIntentAreaName(request.getIntentArea()); + String intentAreaName = getIntentAreaName(request.getIntentAreaId()); 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.getPartnerName(),request.getPartnerMobile(),request.getInvestmentManagerId(),request.getUserPortraitQueryType() - ,request.getIntentAreaId(),request.getIntentAreaQueryType(),request.getLineStartTime(),request.getLineEndTime(),request.getUserChannelQueryType())); + request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList(),request.getUserChannelIdList() + , request.getUpdateStartTime(), request.getUpdateEndTime(), request.getPartnerName(),request.getPartnerMobile(),request.getInvestmentManagerId(),request.getUserPortraitQueryType() + ,request.getIntentAreaQueryType(),request.getLineStartTime(),request.getLineEndTime(),request.getUserChannelQueryType())); List list = privateLineList.getList(); if (CollectionUtils.isEmpty(list)){ return privateLineList; From 07d22ae3d0656e58a71a979d031ee34a74c8a51a 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 17:49:06 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerLineInfoMapper.xml | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 9ded68729..6c19a5c61 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -565,9 +565,15 @@ AND hpli.create_time BETWEEN #{lineStartTime} and #{lineEndTime} - + and hoai.area_path like concat('%/',#{intentAreaName},'/%') + + and hoai.area_path like concat('%/',#{intentAreaName},'/%') + + + AND hoai.area_path is null + AND hpuinfo.accept_adjust_type = #{acceptAdjustType} @@ -580,12 +586,6 @@ AND hpli.investment_manager = #{investmentManagerId} - - AND hpuinfo.want_shop_area = #{intentAreaId} - - - AND hpuinfo.want_shop_area != #{intentAreaId} - AND hpuinfo.shop_code like concat('%',#{storeKeyword},'%') @@ -604,15 +604,19 @@ - - #{userPortraitId} + + bi.user_portrait like concat("%,", #{userPortraitId}, ",%") - - #{userPortraitId} + + bi.user_portrait not like concat("%,", #{userPortraitId}, ",%") + + bi.user_portrait is null + + #{userChannelId} @@ -623,6 +627,9 @@ #{userChannelId} + + hpuinfo.user_channel_id is null + #{developmentManager} From 758d9bfa8c4c8305a5cc3067842dbc9c9eecb2c9 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 17:58:38 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerLineInfoMapper.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 6c19a5c61..70c52426a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -565,14 +565,14 @@ AND hpli.create_time BETWEEN #{lineStartTime} and #{lineEndTime} - + and hoai.area_path like concat('%/',#{intentAreaName},'/%') - + and hoai.area_path like concat('%/',#{intentAreaName},'/%') - AND hoai.area_path is null + AND hpuinfo.want_shop_area is null AND hpuinfo.accept_adjust_type = #{acceptAdjustType} @@ -603,31 +603,31 @@ #{userId} - + bi.user_portrait like concat("%,", #{userPortraitId}, ",%") - + bi.user_portrait not like concat("%,", #{userPortraitId}, ",%") - + bi.user_portrait is null - + #{userChannelId} - + #{userChannelId} - + hpuinfo.user_channel_id is null From e6c1e1989f16fde3d1f7d411bdba517c56045639 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 18:36:32 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 70c52426a..811ee5ee8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -571,7 +571,7 @@ and hoai.area_path like concat('%/',#{intentAreaName},'/%') - + AND hpuinfo.want_shop_area is null From ad46e015ea5a34ca695de327c6754dbd77c113cb 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 18:52:58 +0800 Subject: [PATCH 9/9] =?UTF-8?q?sql=E4=BF=AE=E5=A4=8D2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 811ee5ee8..d825b8f44 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -569,7 +569,7 @@ and hoai.area_path like concat('%/',#{intentAreaName},'/%') - and hoai.area_path like concat('%/',#{intentAreaName},'/%') + and hoai.area_path not like concat('%/',#{intentAreaName},'/%') AND hpuinfo.want_shop_area is null