定时器设置

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/HandoverExternalMapper.java

@@ -49,6 +49,15 @@ public interface HandoverExternalMapper {
      * 查询待分配客户列表
      *
      * @param wxEnterpriseId
+     * @param staffIds
+     * @return
+     */
+    List<String> listIdByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
+
+    /**
+     * 查询待分配客户列表
+     *
+     * @param wxEnterpriseId
      * @return
      */
     List<TabHandoverExternal> listByIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("ids") List<String> ids);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/HandoverServiceImpl.java

@@ -19,6 +19,7 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -81,6 +82,11 @@ public class HandoverServiceImpl implements HandoverService {
                 logger.info("staff已经存在不许重复");
                 return;
             }
+            List<String> staffIds = new ArrayList<>();
+            staffIds.add(handoverStaff.getStaffId());
+            List<String> handoverExternalIds = handoverExternalMapper.listIdByStaffIds(wxEnterpriseId, staffIds);
+
+            //todo 每天需要刷新下旧的外部联系人数据
             List<TabHandoverExternal> externalList = list.stream().map(dto -> {
                 TabHandoverExternal mid = getHandExternal(dto, wxEnterprise);
                 mid.setStaffId(handoverStaff.getStaffId());
@@ -110,13 +116,14 @@ public class HandoverServiceImpl implements HandoverService {
         TabHandoverStaff handoverStaff = handoverStaffMapper.getByStaffId(wxEnterpriseId, haobanStaff.getStaffId());
         if (null != handoverStaff) {
             logger.info("对应的handoverStaff不存在：{}", haobanStaff.getStaffId());
-            return null;
+            return handoverStaff;
         }
         handoverStaff = new TabHandoverStaff();
         TabHaobanClerkMainStoreRelated clerkMainStoreRelated = clerkMainStoreRelatedMapper.getLastNoStatusByStaffId(wxEnterpriseId, haobanStaff.getStaffId());
         if (null == clerkMainStoreRelated) {
             logger.info("没有主门店：{}", haobanStaff.getStaffId());
-            //todo 需要过滤
+            // 需要过滤 没有主门店的人 不需要执行
+            return null;
 //            return null;
         } else {
             handoverStaff.setStoreId(clerkMainStoreRelated.getStoreId());

haoban-manage3-service/src/main/resources/mapper/HandoverExternalMapper.xml

@@ -264,6 +264,20 @@
         order by create_time desc
     </select>
 
+    <select id="listIdByStaffIds" resultMap="BaseResultMap">
+        select
+        handover_external_id
+        from tab_haoban_handover_external
+        where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+        <if test="staffIds!=null and staffIds.size>0">
+            and staff_id in
+            <foreach collection="staffIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        and status_flag=1
+    </select>
+
     <select id="listByIds" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

haoban-manage3-service/src/main/resources/mapper/HandoverTransferMapper.xml

@@ -167,7 +167,7 @@
     where wx_enterprise_id=#{wxEnterpriseId}
         and store_id = #{storeId}
     and status_flag=1
-    order by update_time desc group by handover_staff_id
+        group by handover_staff_id
   </select>
 
     <select id="listTransferByHandoverStaffId" resultMap="BaseResultMap">