Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java

@@ -6,11 +6,10 @@ 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.cool.store.vo.LineFollowHistoryVO;
-import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
@@ -91,9 +90,9 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.selectPartnerLineInfoAndBaseInfo(lineId);
     }
 
-    public PageInfo<HyPartnerLineInfoDO> lastMonthCloseLine(String userId, String lastMonthTodayDate){
+    public List<HyPartnerLineInfoDO> lastMonthCloseLine(String userId, String lastMonthTodayDate){
         if (userId==null){
-            return new PageInfo<>();
+            return new ArrayList<>();
         }
         return hyPartnerLineInfoMapper.lastMonthCloseLine(userId,lastMonthTodayDate);
     }
@@ -115,7 +114,7 @@ public class HyPartnerLineInfoDAO {
     }
 
 
-    public PageInfo<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentArea , Integer acceptAdjustType){
+    public List<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentArea , Integer acceptAdjustType){
         return hyPartnerLineInfoMapper.getBlackList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType);
     }
 
@@ -127,10 +126,16 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason);
     }
 
-    public PageInfo<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, Date updateStartTime, Date updateEndTime, List<String> userIdList){
+    public List<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, Date updateStartTime, Date updateEndTime, List<String> userIdList){
         return  hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType,updateStartTime,updateEndTime,userIdList);
     }
 
+    public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd,
+                                                        String intentArea, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList){
+        return  hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword,  keywordType,  workflowStage,  workflowStatus,  deadlineStart,  deadlineEnd,
+                 intentArea,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList);
+    }
+
 
     public List<HyPartnerLineInfoDO> getPartnerLastLine(List<String> partnerIdList){
         if (CollectionUtils.isEmpty(partnerIdList)){

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java

@@ -90,7 +90,7 @@ public interface HyPartnerLineInfoMapper {
      * @param lastMonthTodayDate
      * @return
      */
-    PageInfo<HyPartnerLineInfoDO>  lastMonthCloseLine(@Param("userId") String userId,
+    List<HyPartnerLineInfoDO>  lastMonthCloseLine(@Param("userId") String userId,
                                                       @Param("lastMonthTodayDate") String lastMonthTodayDate);
 
     /**
@@ -116,7 +116,7 @@ public interface HyPartnerLineInfoMapper {
      * @param acceptAdjustType
      * @return
      */
-    PageInfo<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword,
+    List<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword,
                                                @Param("phoneKeyword") String phoneKeyword,
                                                @Param("intentArea") String intentArea ,
                                                @Param("acceptAdjustType") Integer acceptAdjustType);
@@ -150,7 +150,7 @@ public interface HyPartnerLineInfoMapper {
      * @param userIdList
      * @return
      */
-    PageInfo<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword,
+    List<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword,
                                                     @Param("phoneKeyword") String phoneKeyword,
                                                     @Param("intentArea") String intentArea,
                                                     @Param("acceptAdjustType") Integer acceptAdjustType,
@@ -158,6 +158,24 @@ public interface HyPartnerLineInfoMapper {
                                                     @Param("updateEndTime") Date updateEndTime,
                                                     @Param("userIdList") List<String> userIdList);
 
+
+    /**
+     *
+     * @return
+     */
+    List<PrivateSeaLineDTO> getPrivateSeaLineList(@Param("keyword") String keyword,
+                                                  @Param("keywordType") String keywordType,
+                                                  @Param("workflowStage") String workflowStage,
+                                                  @Param("workflowStatus") String workflowStatus,
+                                                  @Param("deadlineStart") Date deadlineStart,
+                                                  @Param("deadlineEnd") Date deadlineEnd,
+                                                  @Param("intentArea") String intentArea,
+                                                  @Param("acceptAdjustType") Integer acceptAdjustType,
+                                                  @Param("storeKeyword") String storeKeyword,
+                                                  @Param("storeKeywordType") String storeKeywordType,
+                                                  @Param("userIdList") List<String> userIdList);
+
+
     /**
      * 查询对应的加盟商最近线索
      * @param partnerIdList

coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml

@@ -432,6 +432,71 @@
   </select>
 
 
+  <select id="getPrivateSeaLineList" resultType="com.cool.store.dto.partner.PrivateSeaLineDTO">
+    SELECT
+      hpli.id  as lineId,
+      hpli.partner_id  as partnerId,
+      hpli.workflow_stage  as workflowStage,
+      hpli.workflow_status  as workflowStatus,
+      hpli.deadline  as deadline,
+      hpli.investment_manager  as investmentManager,
+      hpli.development_manager  as developmentManager,
+      hpli.line_status  as lineStatus,
+      hpli.update_time  as updateTime,
+      hpii.want_shop_area as wantShopArea,
+      hpii.accept_adjust_type as acceptAdjustType,
+      hpuinfo.username as partnerUserName,
+      hpuinfo.mobile as partnerUserPhone,
+      hpuinfo.shop_name as storeName,
+      hpuinfo.recommend_partner_name as recommendPartnerName,
+    eu.name as investmentManagerName
+    FROM
+    hy_partner_line_info hpli
+    LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id
+    LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id
+    LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id
+    WHERE line_status in (1,2)
+    <if test="keywordType!=null and keywordType=='name'">
+      AND (eu.name  like concat('%',#{keyword},'%') or  hpuinfo.username  like concat('%',#{keyword},'%'))
+    </if>
+    <if test="keywordType!=null and keywordType=='mobile'">
+      AND ( eu.mobile  like concat('%',#{keyword},'%') or  hpuinfo.mobile   like concat('%',#{keyword},'%')')
+    </if>
+    <if test="workflowStage!=null and workflowStage!=''">
+      AND hpli.workflow_stage = #{workflowStage}
+    </if>
+    <if test="workflowStatus!=null and workflowStatus!=''">
+      AND hpli.workflow_status = #workflowStatus}
+    </if>
+    <if test="deadlineStart!=null and deadlineEnd!=null">
+      AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart}
+    </if>
+    <if test="intentArea!=null and intentArea!=''">
+      AND hpuinfo.want_shop_area = #{intentArea}
+    </if>
+    <if test="acceptAdjustType!=null">
+      AND hpuinfo.accept_adjust_type = #{acceptAdjustType}
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==storeCode">
+      AND hpuinfo.shop_code  like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==storeName">
+      AND hpuinfo.shop_name  like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==partnerName">
+      AND hpuinfo.recommend_partner_name  like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==partnerMobile">
+      AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="userIdList!=null and userIdList.size>0">
+      <foreach collection="userIdList" item="userId" open="and a.investment_manager in (" close=")" separator=",">
+        #{userId}
+      </foreach>
+    </if>
+  </select>
+
+
   <select id="getPartnerLastLine" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"></include>

coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java

@@ -0,0 +1,72 @@
+package com.cool.store.dto.partner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/19 15:30
+ * @Version 1.0
+ */
+@Data
+public class PrivateSeaLineDTO {
+
+
+    @ApiModelProperty("线索ID")
+    private Long lineId;
+
+    @ApiModelProperty("加盟商用户ID")
+    private String partnerId;
+
+    @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
+    private String workflowStage;
+
+    @ApiModelProperty("流程子状态")
+    private String workflowStatus;
+
+    @ApiModelProperty("加盟商用户名称")
+    private String partnerUserName;
+
+    @ApiModelProperty("加盟商用户手机号")
+    private String partnerUserPhone;
+
+    @ApiModelProperty("截止时间")
+    private Date deadline;
+
+    @ApiModelProperty("招商经理")
+    private String investmentManager;
+
+    @ApiModelProperty("招商经理名称")
+    private String investmentManagerName;
+
+
+    @ApiModelProperty("开发经理")
+    private String developmentManager;
+
+    @ApiModelProperty("意向开店区域")
+    private String wantShopArea;
+
+    @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
+    private Integer acceptAdjustType;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("门店编码")
+    private String storeCode;
+
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("线索状态")
+    private Integer lineStatus;
+
+    @ApiModelProperty("推荐加盟商ID")
+    private String recommendPartnerId;
+
+    @ApiModelProperty("推荐加盟商名称")
+    private String recommendPartnerName;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java

@@ -1,5 +1,6 @@
 package com.cool.store.request;
 
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,16 +14,17 @@ import java.util.Date;
  */
 @Data
 @ApiModel
-public class PrivateSeaLineListRequest {
+public class PrivateSeaLineListRequest  extends PageInfoRequest {
 
+    @ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】 搜索关键字")
+    private String keyword;
 
-    @ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】")
+    @ApiModelProperty("name:表示用户姓名/招商经理姓名  mobile 用户手机号/招商经理手机号")
-    private String keyWord;
+    private String keywordType;
 
     @ApiModelProperty("一级下拉列表选择当前意向阶段")
     private String workflowStage;
 
-
     @ApiModelProperty("二级下拉列表可选项为当前一级下拉列表选中的意向阶段的状态")
     private String workflowStatus;
 
@@ -39,11 +41,9 @@ public class PrivateSeaLineListRequest {
     private Integer acceptAdjustType;
 
     @ApiModelProperty("【推荐店铺编码】、【推荐店铺名称】、【加盟商姓名】或【手机号】")
-    private String keyInfo;
+    private String storeKeyword;
-
+    @ApiModelProperty("【storeCode  -推荐店铺编码】、【storeName  推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile  手机号】")
-
+    private String storeKeywordType;
-
-
 
 
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java

@@ -17,9 +17,9 @@ public class PrivateSeaLineListVo {
 
 
     @ApiModelProperty("线索ID")
-    private Long id;
+    private Long lineId;
 
-    @ApiModelProperty("hy_partner_user_info.partner_id")
+    @ApiModelProperty("加盟商用户ID")
     private String partnerId;
 
     @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
@@ -28,9 +28,6 @@ public class PrivateSeaLineListVo {
     @ApiModelProperty("流程子状态")
     private String workflowStatus;
 
-    @ApiModelProperty("加盟商用户ID")
-    private String partnerUserId;
-
     @ApiModelProperty("加盟商用户名称")
     private String partnerUserName;
 
@@ -43,12 +40,15 @@ public class PrivateSeaLineListVo {
     @ApiModelProperty("招商经理")
     private String investmentManager;
 
-    @ApiModelProperty("开发主管")
+    @ApiModelProperty("招商经理")
-    private String developmentDirector;
+    private String investmentManagerName;
 
     @ApiModelProperty("开发经理")
     private String developmentManager;
 
+    @ApiModelProperty("开发经理")
+    private String developmentManagerName;
+
     @ApiModelProperty("意向开店区域")
     private String wantShopArea;
 

coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java

@@ -2,6 +2,7 @@ package com.cool.store.service;
 
 import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.LineRequest;
+import com.cool.store.request.PrivateSeaLineListRequest;
 import com.cool.store.vo.*;
 import com.github.pagehelper.PageInfo;
 
@@ -104,6 +105,15 @@ public interface HyPartnerLineInfoService {
      */
     PageInfo<PublicSeaLineListVo> publicSeaLineList(String userId,LineRequest lineRequest);
 
+
+    /**
+     * 私海列表
+     * @param userId
+     * @param privateSeaLineListRequest
+     * @return
+     */
+    PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest privateSeaLineListRequest) ;
+
     PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId);
 
     /**

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -19,6 +19,7 @@ import com.cool.store.enums.WorkflowStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.LineRequest;
+import com.cool.store.request.PrivateSeaLineListRequest;
 import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.RedisUtilPool;
@@ -92,7 +93,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     public PageInfo<PartnerLineInfoVO> lastMonthCloseLine(String userId, Integer pageSize, Integer pageNumber) {
         PageHelper.startPage(pageNumber,pageSize);
         String lastMonthTodayDate = DateUtil.format(CoolDateUtils.getDateBefore(new Date(),-30), CoolDateUtils.DATE_FORMAT_SEC);
-        PageInfo hyPartnerLineInfoDOPageInfo = hyPartnerLineInfoDAO.lastMonthCloseLine(userId, lastMonthTodayDate);
+        PageInfo hyPartnerLineInfoDOPageInfo = new PageInfo(hyPartnerLineInfoDAO.lastMonthCloseLine(userId, lastMonthTodayDate));
 
         List<HyPartnerLineInfoDO> list = hyPartnerLineInfoDOPageInfo.getList();
         List<PartnerLineInfoVO> result = new ArrayList<>();
@@ -150,7 +151,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     @Override
     public PageInfo<BlackListVO> getBlackList(LineRequest LineRequest) {
         PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize());
-        PageInfo blackListDTOPageInfo = hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType());
+        PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType()));
         List<PartnerBlackListDTO> list = blackListDTOPageInfo.getList();
         List<BlackListVO> result = new ArrayList<>();
         list.stream().forEach(x->{
@@ -256,8 +257,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             userIds = Arrays.asList(userId);
         }
         PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize());
-        PageInfo publicSeaLineList = hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
+        PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
-                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds);
+                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds));
 
         List<PublicSeaLineDTO> list = publicSeaLineList.getList();
         if (CollectionUtils.isEmpty(list)){
@@ -302,6 +303,52 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         return publicSeaLineList;
     }
 
+    @Override
+    public PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest request) {
+        // TODO: 2023/6/19 su userlist计算
+        PageHelper.startPage(request.getPageNum(),request.getPageSize());
+        PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(),  request.getKeywordType(),  request.getWorkflowStage(),
+                request.getWorkflowStatus(),  request.getDeadlineStart(),  request.getDeadlineEnd(),
+                request.getIntentArea(),  request.getAcceptAdjustType(),  request.getStoreKeyword(),  request.getStoreKeywordType(), null));
+        List<PrivateSeaLineDTO> list = privateLineList.getList();
+        if (CollectionUtils.isEmpty(list)){
+            return new PageInfo<>();
+        }
+        Map<String, String> devManagerMap = new HashMap<>();
+        List<String> devManagerIdList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getDevelopmentManager())).map(PrivateSeaLineDTO::getDevelopmentManager).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(devManagerIdList)){
+            List<EnterpriseUserDO> devManagerList = enterpriseUserDAO.getUserInfoByUserIds(devManagerIdList);
+            devManagerMap = devManagerList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getName));
+        }
+        List<PrivateSeaLineListVo> result = new ArrayList<>();
+
+        Map<String, String> finalDevManagerMap = devManagerMap;
+        list.forEach(x->{
+            PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo();
+            privateSeaLineListVo.setLineId(x.getLineId());
+            privateSeaLineListVo.setLineStatus(x.getLineStatus());
+            privateSeaLineListVo.setPartnerId(x.getPartnerId());
+            privateSeaLineListVo.setDeadline(x.getDeadline());
+            privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone());
+            privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());
+            privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager());
+            privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager());
+            privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManagerName());
+            privateSeaLineListVo.setStoreCode(x.getStoreCode());
+            privateSeaLineListVo.setStoreName(x.getStoreName());
+            privateSeaLineListVo.setUpdateTime(x.getUpdateTime());
+            privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId());
+            privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName());
+            privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
+            privateSeaLineListVo.setWantShopArea(x.getWantShopArea());
+            privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
+            privateSeaLineListVo.setDevelopmentManagerName(finalDevManagerMap.get(x.getDevelopmentManager()));
+            result.add(privateSeaLineListVo);
+        });
+        privateLineList.setList(result);
+        return privateLineList;
+    }
+
     @Override
     public PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId) {
         PartnerLineBaseInfoVO lineBaseInfoVO = new PartnerLineBaseInfoVO();