From 0578c21582baca6a3724e8467deae6bcea3ca1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 23 Apr 2024 16:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=88=86=E9=85=8D=E7=BA=BF=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/dao/LineInfoDAO.java    |  4 ++--
 .../java/com/cool/store/mapper/LineInfoMapper.java   |  2 +-
 .../src/main/resources/mapper/LineInfoMapper.xml     | 12 +++++++++---
 .../java/com/cool/store/service/LineService.java     |  2 +-
 .../com/cool/store/service/impl/LineServiceImpl.java |  4 ++--
 .../store/service/impl/WechatMiniAppServiceImpl.java | 12 ++++++++++--
 .../store/controller/webb/LineInfoController.java    | 11 +++++++++--
 7 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
index add5140e9..0dc2ce0d6 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
@@ -125,8 +125,8 @@ public class LineInfoDAO {
         return lineInfo;
     }
 
-    public List<LineInfoDO> publicLineList(PublicLineListRequest publicLineListRequest) {
-        List<LineInfoDO> lineInfo = lineInfoMapper.publicLineList(publicLineListRequest);
+    public List<LineInfoDO> publicLineList(PublicLineListRequest publicLineListRequest,Boolean publicFlag) {
+        List<LineInfoDO> lineInfo = lineInfoMapper.publicLineList(publicLineListRequest,publicFlag);
         return lineInfo;
     }
 
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
index 1b25f9677..7477e7d21 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
@@ -55,7 +55,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
      * @param publicLineListRequest
      * @return
      */
-    List<LineInfoDO> publicLineList(@Param("request") PublicLineListRequest publicLineListRequest);
+    List<LineInfoDO> publicLineList(@Param("request") PublicLineListRequest publicLineListRequest, @Param("publicFlag") Boolean publicFlag);
 
     /**
      * 根据lineId判断是更新还是插入
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index ca4270852..5178034b7 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -436,14 +436,20 @@
   <select id="publicLineList" resultMap="BaseResultMap">
     select * from xfsg_line_info
     where  deleted = 0 and line_status = 0 and join_status = 0
+    <if test="publicFlag">
+      and investment_manager is not null
+    </if>
+    <if test="publicFlag==false">
+      and investment_manager is null
+    </if>
     <if test="request.userName != null and request.username!=''">
-      and username = #{request.userName}
+      and username like concat('%',#{request.userName},'%')
     </if>
     <if test="request.mobile != null and request.mobile!=''">
-      and mobile = #{request.mobile}
+      and mobile like concat('%', #{request.mobile},'%')
     </if>
     <if test="request.keyword != null and request.keyword!=''">
-      and (username like #{request.keyword} or mobile like #{request.keyword})
+      and (username like concat('%',#{request.keyword},'%') or mobile like concat('%',  #{request.keyword},'%'))
     </if>
     <if test="request.lineSource != null">
       and line_source =  #{request.lineSource}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
index 9cc0a3660..c0c73c9b0 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
@@ -36,7 +36,7 @@ public interface LineService {
      * @param loginUserInfo
      * @return
      */
-    PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo  loginUserInfo);
+    PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo  loginUserInfo ,Boolean publicFlag);
 
 
     /**
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 4a8142d30..cf87e3ce2 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
@@ -168,9 +168,9 @@ public class LineServiceImpl implements LineService {
     }
 
     @Override
-    public PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo loginUserInfo) {
+    public PageInfo<PublicLineListVO> getPublicLineList(PublicLineListRequest publicLineListRequest, LoginUserInfo loginUserInfo, Boolean publicFlag) {
         PageHelper.startPage(publicLineListRequest.getPageNum(), publicLineListRequest.getPageSize());
-        List<LineInfoDO> lineInfoDOS = lineInfoDAO.publicLineList(publicLineListRequest);
+        List<LineInfoDO> lineInfoDOS = lineInfoDAO.publicLineList(publicLineListRequest,publicFlag);
         PageInfo page = new PageInfo(lineInfoDOS);
         Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS);
         List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
index 23012ebb7..213ef00ca 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
@@ -6,8 +6,7 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.*;
 import com.cool.store.dto.wx.*;
 import com.cool.store.entity.*;
-import com.cool.store.enums.ErrorCodeEnum;
-import com.cool.store.enums.UserChannelEnum;
+import com.cool.store.enums.*;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.http.WechatRest;
 import com.cool.store.mapper.HyPartnerUserChannelMapper;
@@ -123,6 +122,15 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
                     }
                     hyPartnerUserInfoDO.setUserChannelId(channelId);
                     hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO);
+                    //授权的时候 新增线索 放到公海
+                    LineInfoDO lineInfoDO = new LineInfoDO();
+                    lineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode());
+                    lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
+                    lineInfoDO.setMobile(hyPartnerUserInfoDO.getMobile());
+                    lineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
+                    lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode());
+                    lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
+                    lineInfoDAO.insertOrUpdate(lineInfoDO);
                 }else {
                     hyPartnerUserInfoDO.setOpenid(openid);
                     hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
index e65ea2145..5615fdea3 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
@@ -62,9 +62,16 @@ public class LineInfoController {
 
     @ApiOperation("公海线索")
     @PostMapping("/getPublicLineList")
-    public ResponseResult<PageInfo<PublicLineListVO>> getTeamLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
+    public ResponseResult<PageInfo<PublicLineListVO>> getPublicLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
         LoginUserInfo user = CurrentUserHolder.getUser();
-        return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user));
+        return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user,Boolean.TRUE));
+    }
+
+    @ApiOperation("待分配线索")
+    @PostMapping("/getAssignedLineList")
+    public ResponseResult<PageInfo<PublicLineListVO>> getAssignedLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
+        LoginUserInfo user = CurrentUserHolder.getUser();
+        return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user,Boolean.FALSE));
     }
 
     @ApiOperation("我负责的加盟商")