From f3e95c6032f20d6ef7864366a3d186a3fa0cb6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 25 Jul 2023 11:54:23 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/NoticeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java index cf20e055b..8d04259fa 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java @@ -22,7 +22,7 @@ import java.util.List; @Slf4j @Service public class NoticeService { - @Value("${feishu.notice.link.url:null}") + @Value("${feishu.notice.link.url}") private String linkUrl; @Autowired private ISVHttpRequest isvHttpRequest; From ea9199240c6b5b9e4b0edc7db6c56d7e185b7f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 13:35:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 0aea443ad..6dba31838 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -52,7 +52,7 @@ #{record.workflowStage}, #{record.workflowStatus}, #{record.lineStatus}, - #{record.investmentManager} + #{record.investmentManager}) From 6569ee131301fb07ca5b9089236808290969ddcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 13:44:20 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 6dba31838..01b32777e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -579,7 +579,7 @@ From 46b80b379f8fb614065ee05f8ea7a937cf528b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 13:49:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 01b32777e..f1614b231 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -580,6 +580,11 @@ SELECT partner_id, IFNULL(COUNT(1), 0) AS followCount FROM hy_partner_line_info where (deleted = 1 or (deleted=0 and line_status=0 and close_time is not null and investment_manager is not null)) + + + #{partnerId} + + GROUP BY partner_id; From 6c1fc5236c40d06bf1b08cc519dd68588edb95f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 14:34:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index f1614b231..8c60f26f5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -579,7 +579,7 @@ SELECT partner_id, IFNULL(COUNT(1), 0) AS followCount FROM hy_partner_line_info - where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null and investment_manager is not null)) + where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null )) and investment_manager is not null #{partnerId} @@ -605,7 +605,7 @@ From a6f32fcd82ee89df1d74183e4f91729babb93382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 15:44:15 +0800 Subject: [PATCH 7/7] assignFollowUser --- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 2009bf430..4979bd2d4 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 @@ -577,6 +577,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @Override public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) { log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType); + + List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); + //如果跟进次数大于1 直接使用上一次的招商经理 + if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){ + return Boolean.TRUE; + } //当前加盟商线索 HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId); //如果意向区域没有绑定战区 不分配招商经理