Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

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

@@ -52,7 +52,7 @@
       #{record.workflowStage},
       #{record.workflowStatus},
       #{record.lineStatus},
-      #{record.investmentManager}
+      #{record.investmentManager})
     </foreach>
   </insert>
 
@@ -579,7 +579,12 @@
   <select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">
     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))
+    where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null )) and investment_manager is not null
+    <if test="partnerIdList!=null and partnerIdList.size>0">
+      <foreach collection="partnerIdList" item="partnerId" open="and partner_id in (" close=")" separator=",">
+        #{partnerId}
+      </foreach>
+    </if>
     GROUP BY partner_id;
   </select>
 
@@ -600,7 +605,7 @@
   <select id="getLineFollowHistoryList" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List"></include>
     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
     and partner_id = #{partner_id}
     order by id desc
   </select>

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<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId);
+        //如果跟进次数大于1 直接使用上一次的招商经理
+        if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){
+            return Boolean.TRUE;
+        }
         //当前加盟商线索
         HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
         //如果意向区域没有绑定战区 不分配招商经理

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;