From 23214127f1e3b6bbc04c5d5f345cc9133f4b1037 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: Mon, 23 Oct 2023 13:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E5=95=86=E7=BB=8F=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cool/store/dao/EnterpriseUserDAO.java   | 16 ++++++++++++++++
 .../cool/store/mapper/EnterpriseUserMapper.java |  8 ++++++++
 .../resources/mapper/EnterpriseUserMapper.xml   |  9 ++++++++-
 .../store/request/PartnerUserInfoRequest.java   |  3 +++
 .../store/request/UserOnlineStatusRequest.java  | 13 +++++++++++++
 .../store/service/HyPartnerLineInfoService.java |  2 +-
 .../com/cool/store/service/LoginService.java    |  2 ++
 .../impl/HyPartnerLineInfoServiceImpl.java      | 17 ++++++++++++-----
 .../store/service/impl/LoginServiceImpl.java    |  6 ++++++
 .../impl/PartnerUserInfoServiceImpl.java        |  2 +-
 .../service/impl/WechatMiniAppServiceImpl.java  |  4 ++++
 .../cool/store/controller/LoginController.java  |  6 ++++++
 12 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
index bcc3c2400..8e4599dc5 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
@@ -2,6 +2,8 @@ package com.cool.store.dao;
 
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.EnterpriseUserMapper;
 import com.cool.store.utils.StringUtil;
 import com.google.common.collect.Lists;
@@ -48,6 +50,20 @@ public class EnterpriseUserDAO {
         enterpriseUserMapper.batchInsertOrUpdate(insertOrUpdateList);
     }
 
+    public void updateByPrimaryKeySelective(EnterpriseUserDO enterpriseUserDO) {
+        if(enterpriseUserDO == null){
+            return;
+        }
+        enterpriseUserMapper.updateByPrimaryKeySelective(enterpriseUserDO);
+    }
+
+    public void updateOnlineStatusByUserId(String userId,Integer onlineStatus) {
+        if (StringUtils.isEmpty(userId)||onlineStatus == null){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
+        }
+        enterpriseUserMapper.updateOnlineStatusByUserId(userId,onlineStatus);
+    }
+
     /**
      * 删除用户
      * @param excludeUserIds
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
index 488949068..585888fc9 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
@@ -25,6 +25,14 @@ public interface EnterpriseUserMapper {
      */
     int updateByPrimaryKeySelective(EnterpriseUserDO record);
 
+    /**
+     * updateByUserId
+     * @param userId
+     * @param onlineStatus
+     * @return
+     */
+    int updateOnlineStatusByUserId(@Param("userId") String userId, @Param("onlineStatus") Integer onlineStatus);
+
     /**
      * 获取用户信息
      * @param userId
diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
index 6a9698ceb..ad824fe95 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
@@ -226,6 +226,9 @@
             <if test="userRegionIds != null">
                 user_region_ids = #{userRegionIds},
             </if>
+            <if test="onlineStatus != null">
+                online_status = #{onlineStatus},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -240,6 +243,10 @@
         user_id = #{userId}
     </select>
 
+    <update id="updateOnlineStatusByUserId">
+    update enterprise_user set online_status = #{onlineStatus} where user_id = #{userId}
+    </update>
+
     <select id="getUserInfoByUserIds" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>,
@@ -309,7 +316,7 @@
         from
             enterprise_user
         where
-            deleted = 0 and is_leader = 0 and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId"> user_region_ids like concat("%", #{regionId}, "%") </foreach>
+            deleted = 0 and online_status = 1 and is_leader = 0 and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId"> user_region_ids like concat("%", #{regionId}, "%") </foreach>
         ORDER BY
         CASE WHEN jobnumber='' OR jobnumber IS NULL THEN 1 ELSE 0 END,
         SUBSTR(jobnumber,1,1),
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java
index c8a66ced7..cab60b301 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java
@@ -55,4 +55,7 @@ public class PartnerUserInfoRequest {
     @ApiModelProperty("推荐加盟商手机号")
     private String recommendPartnerMobile;
 
+    @ApiModelProperty("招商经理ID")
+    private String investmentManager;
+
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java
new file mode 100644
index 000000000..145c40467
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java
@@ -0,0 +1,13 @@
+package com.cool.store.request;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/10/20 10:59
+ * @Version 1.0
+ */
+@Data
+public class UserOnlineStatusRequest {
+
+    private Integer onlineStatus;
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
index c5603c112..3bc90415a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
@@ -159,7 +159,7 @@ public interface HyPartnerLineInfoService {
      * @param acceptAdjustType
      * @return
      */
-    HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag);
+    HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag,String investmentManagerId);
 
     Long checkGenerateNewLineId(Long lineId);
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java
index 43332e60e..fc01b7503 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java
@@ -6,4 +6,6 @@ public interface LoginService {
 
 
     Object feiShuLogin(String userId, Boolean needRefreshToken, String avatar);
+
+    Boolean saveUserOnlineStatus(String userId,Integer onlineStatus);
 }
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 2520f62f5..55f66cbe0 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
@@ -839,13 +839,20 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         return null;
     }
     @Override
-    public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag) {
+    public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag,String investmentManagerId) {
         // 生成一条线索
         HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
-        Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType,assignFlag);
+        //短信拼接了招商经理 直接使用 不需要走自动分配的逻辑 其他方式 走自动分配
         String investmentManager = null;
-        if (flag){
-            investmentManager = getAssignFollowUser(partnerId, "intent");
+        Boolean flag = Boolean.FALSE;
+        if (StringUtils.isNotEmpty(investmentManagerId)){
+            investmentManager = investmentManagerId;
+            flag = Boolean.TRUE;
+        }else {
+            flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType,assignFlag);
+            if (flag){
+                investmentManager = getAssignFollowUser(partnerId, "intent");
+            }
         }
         if(hyPartnerLineInfoDO == null){
             hyPartnerLineInfoDO = new HyPartnerLineInfoDO();
@@ -883,7 +890,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId()));
             HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
             // 生成一条新线索 生成新线索的时候不需要公海到私海
-            HyPartnerLineInfoDO newLineInfoDO =  this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType(),Boolean.FALSE);
+            HyPartnerLineInfoDO newLineInfoDO =  this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType(),Boolean.FALSE,null);
             // 生成一条意向基本信息
             HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId);
             hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
index eb2e11280..cc381dad7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
@@ -81,4 +81,10 @@ public class LoginServiceImpl implements LoginService {
         return currentUser;
     }
 
+    @Override
+    public Boolean saveUserOnlineStatus(String userId, Integer onlineStatus) {
+        enterpriseUserDAO.updateOnlineStatusByUserId(userId, onlineStatus);
+        return Boolean.TRUE;
+    }
+
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
index 73d3c079a..702a98a66 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
@@ -115,7 +115,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest);
         hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
         // 生成一条线索
-        HyPartnerLineInfoDO hyPartnerLineInfoDO =  hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE);
+        HyPartnerLineInfoDO hyPartnerLineInfoDO =  hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE,partnerUserInfoRequest.getInvestmentManager());
         // 生成一条意向基本信息
         hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId(), null);
         HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea()));
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 98d125db3..d08d7dfda 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
@@ -163,6 +163,10 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
         return userInfoVO;
     }
 
+    public static void main(String[] args) {
+
+    }
+
     @Override
     public String getUserPhoneNumber(String mobileCode) {
         // 获取小程序token
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java
index 8ff7ff384..691b8b385 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java
@@ -7,6 +7,7 @@ import com.cool.store.dto.login.UserIdInfoDTO;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.http.ISVHttpRequest;
+import com.cool.store.request.UserOnlineStatusRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LoginService;
 import lombok.extern.slf4j.Slf4j;
@@ -61,4 +62,9 @@ public class LoginController {
         return ResponseResult.success(CurrentUserHolder.getUser());
     }
 
+    @PostMapping("/saveUserOnlineStatus")
+    public ResponseResult saveUserOnlineStatus(@RequestBody UserOnlineStatusRequest  param){
+        return ResponseResult.success(loginService.saveUserOnlineStatus(CurrentUserHolder.getUser().getUserId(), param.getOnlineStatus()));
+    }
+
 }