From 01c2ce6b074cd756d80f5bddf8fd1f42b5717ac6 Mon Sep 17 00:00:00 2001
From: "xiaodong.hu" <1075471126@qq.com>
Date: Tue, 31 Oct 2023 14:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ec=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=BB=A5=E5=8F=8A=E9=A3=9E=E4=B9=A6=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=AE=E5=A4=8D=E7=A6=BB=E8=81=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/EnterpriseUserMapper.xml |  4 ++--
 .../store/service/impl/EcSyncServiceImpl.java | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
index 912b7fb62..2cd5366f1 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
@@ -333,12 +333,12 @@
         CAST(SUBSTR(jobnumber,2) AS UNSIGNED) ASC
     </select>
     <select id="selectByMobile" resultType="java.lang.String">
-        SELECT  user_id FROM  enterprise_user WHERE  mobile =#{mobile}  LIMIT 1
+        SELECT  user_id FROM  enterprise_user WHERE  mobile =#{mobile}  and  deleted=0 LIMIT 1
     </select>
     <select id="selectByInvestmentManager"  resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM  enterprise_user WHERE  mobile  like  #{investmentManager}  or  `name` like #{investmentManager}  LIMIT 1
+        FROM  enterprise_user WHERE (  mobile  =  #{investmentManager}  or  `name` = #{investmentManager} )  and  deleted=0  LIMIT 1
     </select>
 
     <select id="getFeishuUserIdsByUserIds" resultMap="BaseResultMap">
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
index dbac9d13a..991c99000 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
@@ -248,6 +248,27 @@ public class EcSyncServiceImpl implements EcSyncService {
                         resultLine.setLineStatus(partnerLine.getLineStatus().intValue() == LineStatusEnum.BLACKLIST.getCode().intValue()
                                 ? LineStatusEnum.BLACKLIST.getCode() : resultLine.getLineStatus());
                         hyPartnerLineInfoDAO.updateByPrimaryKeySelective(resultLine);
+
+                        //分配招商经理发送消息通知
+                        Map<String, String> feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(new ArrayList<String>() {{
+                            add(resultLine.getInvestmentManager());
+                        }});
+                        List<String> feishuIds = feishuUserIdsByUserIds.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList());
+                        try {
+                            eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER,feishuIds,operateName,newUserInfo.getUsername(),newUserInfo.getMobile());
+                        } catch (ApiException e) {
+                            log.error("ec同步至招商发送飞书通知错误" + JSONObject.toJSONString(e));
+                        }
+
+                        //添加新增线索的ec操作日志
+                        LineLogInfo lineLogInfo = new LineLogInfo(partnerLine.getPartnerId(), resultLine.getId(), operateId,
+                                operateName, OperateTypeEnum.ALLOCATION_INVESTMENT_MANAGER,
+                                WorkflowStageEnum.getWorkflowStageByCode(partnerLine.getWorkflowStage()),
+                                partnerLine.getWorkflowStatus(), "");
+                        BlackListLogDTO logDTO = BlackListLogDTO.builder().operateUserId(operateId).operateUsername(operateName)
+                                .mobile(resultBase.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build();
+                        lineLogInfo.setData(logDTO);
+                        hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo);
                     }
                 } else {
                     if (!getFollowLineStatus(partnerLine)) {