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

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

@@ -8,6 +8,8 @@ import com.cool.store.enums.WorkflowSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.LineInfoMapper;
 import com.cool.store.request.LineListRequest;
+import com.cool.store.request.PublicLineListRequest;
+import com.cool.store.vo.PublicLineListVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -91,6 +93,11 @@ public class LineInfoDAO {
         return lineInfo;
     }
 
+    public List<LineInfoDO> publicLineList(PublicLineListRequest publicLineListRequest) {
+        List<LineInfoDO> lineInfo = lineInfoMapper.publicLineList(publicLineListRequest);
+        return lineInfo;
+    }
+
     public void insertOrUpdate(LineInfoDO lineInfoParam){
         lineInfoMapper.insertOrUpdate(lineInfoParam);
     }

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

@@ -0,0 +1,39 @@
+package com.cool.store.dao;
+
+import com.cool.store.dto.TransferLogDTO;
+import com.cool.store.entity.TransferLogDO;
+import com.cool.store.mapper.TransferLogMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/29 17:43
+ * @Version 1.0
+ */
+@Repository
+public class TransferLogDAO {
+
+    @Resource
+    TransferLogMapper transferLogMapper;
+
+    public void add(TransferLogDO transferLog){
+        transferLogMapper.insert(transferLog);
+    }
+
+
+    public List<TransferLogDTO> getTransferLogList(Long lindId){
+        if (lindId == null){
+            return null;
+        }
+        return transferLogMapper.getTransferLogList(lindId);
+    }
+
+
+
+
+
+
+}

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

@@ -3,6 +3,7 @@ package com.cool.store.mapper;
 import com.cool.store.entity.LineInfoDO;
 import com.cool.store.enums.WorkflowSubStageStatusEnum;
 import com.cool.store.request.LineListRequest;
+import com.cool.store.request.PublicLineListRequest;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -29,5 +30,13 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
                               @Param("userId") String userId,
                               @Param("wantShopAreaIds") List<Long> wantShopAreaIds);
 
+
+    /**
+     *  公海线索列表
+     * @param publicLineListVO
+     * @return
+     */
+    List<LineInfoDO> publicLineList(@Param("request") PublicLineListRequest publicLineListRequest);
+
     void insertOrUpdate(@Param("param") LineInfoDO lineInfoParam);
 }

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

@@ -0,0 +1,20 @@
+package com.cool.store.mapper;
+
+import com.cool.store.dto.TransferLogDTO;
+import com.cool.store.entity.TransferLogDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface TransferLogMapper extends Mapper<TransferLogDO> {
+
+    /**
+     * 根据线索ID查询日志
+     * @param lindId
+     * @return
+     */
+    List<TransferLogDTO> getTransferLogList(@Param("lindId") Long lindId);
+
+
+}

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

@@ -304,7 +304,7 @@
 
   <select id="lineList" resultMap="BaseResultMap">
     select * from xfsg_line_info
-    where  deleted = 0
+    where  deleted = 0 and line_status = 1 and join_status = 0
     <if test="userId != null and userId != ''">
       and investment_manager = #{userId}
     </if>
@@ -323,6 +323,9 @@
     <if test="request.createTimeStart!=null and request.createTimeEnd!=null">
       and create_time between #{request.createTimeStart} and #{request.createTimeEnd}
     </if>
+    <if test="request.investmentManagerUserId != null and request.investmentManagerUserId != ''">
+      and investment_manager = #{request.investmentManagerUserId}
+    </if>
     <if test="wantShopAreaIds !=null and wantShopAreaIds.size>0">
       <foreach collection="wantShopAreaIds" item="wantShopAreaId" open="and want_shop_area_id in (" close=")" separator=",">
         #{wantShopAreaId}
@@ -330,4 +333,28 @@
     </if>
   </select>
 
+
+  <select id="publicLineList" resultMap="BaseResultMap">
+    select * from xfsg_line_info
+    where  deleted = 0 and line_status = 0 and join_status = 0
+    <if test="request.userName != null and request.username!=''">
+      and username = #{request.userName}
+    </if>
+    <if test="request.mobile != null and request.mobile!=''">
+      and mobile = #{request.mobile}
+    </if>
+    <if test="request.lineSource != null">
+      and line_source =  #{request.lineSource}
+    </if>
+    <if test="request.createTimeStart!=null and request.createTimeEnd!=null">
+      and create_time between #{request.createTimeStart} and #{request.createTimeEnd}
+    </if>
+    <if test="request.lastDevelopmentManagerUserId != null and request.lastDevelopmentManagerUserId != ''">
+      and development_manager = #{request.lastDevelopmentManagerUserId}
+    </if>
+    <if test="request.lastInvestmentManagerUserId != null and request.lastInvestmentManagerUserId != ''">
+      and investment_manager = #{request.lastInvestmentManagerUserId}
+    </if>
+  </select>
+
 </mapper>

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.TransferLogMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.TransferLogDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="line_id" jdbcType="BIGINT" property="lineId" />
+    <result column="partner_id" jdbcType="BIGINT" property="partnerId" />
+    <result column="from_user_id" jdbcType="VARCHAR" property="fromUserId" />
+    <result column="to_user_id" jdbcType="VARCHAR" property="toUserId" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
+  </resultMap>
+
+
+  <select id="getTransferLogList" resultType="com.cool.store.dto.TransferLogDTO">
+    select
+     b.user_id as fromUserId     ,
+     b.name as fromUserName  ,
+     b.mobile as fromUserMobile  ,
+     c.user_id as toUserId     ,
+     c.name as toUserName  ,
+     c.mobile as toUserMobile  ,
+     a.type as type
+    from
+    xfsg_transfer_log a
+    left join enterprise_user_${enterpriseId} b on b.user_id = a.from_user_id
+    left join enterprise_user_${enterpriseId} c on c.user_id = a.to_user_id  where a.line_id = #{lindId}
+  </select>
+
+</mapper>