Revert "机会人群待建联数"

This reverts commit 38711a29.

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/contact/ContactDataBO.java

@@ -28,10 +28,4 @@ public class ContactDataBO {
      */
     private Integer noConnPotCusNum = 0;
 
-    /**
-     * 业务类型
-     * @see com.gic.haoban.manage.api.enums.content.ShareBizType
-     */
-    private Integer bizType;
-
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/adaptor/ContactAdaptor.java

@@ -23,7 +23,6 @@ import com.gic.haoban.app.customer.dto.contact.ContactParamDTO;
 import com.gic.haoban.app.customer.dto.contact.ContactSumDTO;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.common.utils.DateUtil;
-import com.gic.haoban.manage.api.enums.contact.ContactBizTypeEnum;
 import com.gic.haoban.manage.service.dao.mapper.content.holo.HoloDataSource;
 import com.gic.haoban.manage.service.pojo.bo.contact.ContactDataBO;
 import com.gic.store.goods.dto.potential.PlatformPotentialCustomerOutDTO;
@@ -59,10 +58,10 @@ public class ContactAdaptor {
     /**
      * 潜客商户定时刷新
      */
-    public void contactDataTimer(Integer bizType,String rightMenuCode) {
+    public void contactDataTimer() {
         // 处理潜客相关企业ID
         ServiceResponse<List<EnterpriseUsingStatusDTO>> serviceResponse =
-                enterpriseUseForbidService.getUseEnterpriseByCode(rightMenuCode, null);
+                enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode(), null);
         List<ContactDataBO> list = new ArrayList<>();
         List<String> eidList = Optional.ofNullable(serviceResponse.getResult()).orElse(Collections.emptyList())
                 .stream()
@@ -80,7 +79,7 @@ public class ContactAdaptor {
             for (int i = 0; i < enterpriseClerk.size(); i++) {
                 ClerkListDTO clerk = enterpriseClerk.get(i);
                 // 无归属导购数据
-                if (storeIdSet.add(clerk.getStoreId()) && Objects.equals(bizType, ContactBizTypeEnum.POTENTIAL_CUSTOMER.getType())) {
+                if (storeIdSet.add(clerk.getStoreId())) {
                     contactDataBO = new ContactDataBO();
                     contactDataBO.setEnterpriseId(clerk.getEnterpriseId());
                     contactDataBO.setClerkId("-1");
@@ -91,7 +90,6 @@ public class ContactAdaptor {
                 contactDataBO.setEnterpriseId(clerk.getEnterpriseId());
                 contactDataBO.setClerkId(clerk.getClerkId());
                 contactDataBO.setStoreId(clerk.getStoreId());
-                contactDataBO.setBizType(bizType);
                 list.add(contactDataBO);
                 if (list.size() >= 100 || i == enterpriseClerk.size() - 1) {
                     try {
@@ -118,14 +116,9 @@ public class ContactAdaptor {
         }
         ContactDataBO contactDataBO = list.get(0);
         String enterpriseId = contactDataBO.getEnterpriseId();
-        Integer bizType = contactDataBO.getBizType();
-        PlatformPotentialCustomerOutDTO result = null;
-        if (Objects.equals(bizType, ContactBizTypeEnum.POTENTIAL_CUSTOMER.getType())) {
-            ServiceResponse<PlatformPotentialCustomerOutDTO> potentialResponse = platformPotentialCustomerApiService.getPotentialCustomerOutRule(enterpriseId);
-            if (!potentialResponse.isSuccess() || potentialResponse.getResult() == null) {
-                return;
-            }
-            result = potentialResponse.getResult();
+        ServiceResponse<PlatformPotentialCustomerOutDTO> potentialResponse = platformPotentialCustomerApiService.getPotentialCustomerOutRule(enterpriseId);
+        if (!potentialResponse.isSuccess() || potentialResponse.getResult() == null) {
+            return;
         }
         List<String> clerkIdList = list.stream().map(ContactDataBO::getClerkId).collect(Collectors.toList());
         List<ClerkDTO> clerkDTOS = clerkService.getClerkByClerkIds(new HashSet<>(clerkIdList));
@@ -133,7 +126,7 @@ public class ContactAdaptor {
         for (ContactDataBO dataBO : list) {
             boolean unassigned = Objects.equals(dataBO.getClerkId(), "-1");
             ClerkDTO clerkDTO = clerkMap.get(dataBO.getClerkId());
-            Integer noConnPotCusNum = getNoConnPotCusNum(result, dataBO.getEnterpriseId(), dataBO.getStoreId(), clerkDTO, bizType,unassigned);
+            Integer noConnPotCusNum = getNoConnPotCusNum(potentialResponse.getResult(), dataBO.getEnterpriseId(), dataBO.getStoreId(), clerkDTO, unassigned);
             log.info("clerkId:{},noConnPotCusNum:{}", dataBO.getClerkId(), noConnPotCusNum);
             dataBO.setNoConnPotCusNum(noConnPotCusNum);
         }
@@ -155,7 +148,6 @@ public class ContactAdaptor {
                         temp.setObject("store_id", item.getStoreId());
                         temp.setObject("clerk_id", item.getClerkId());
                         temp.setObject("no_conn_pot_cus_num", item.getNoConnPotCusNum());
-                        temp.setObject("biz_type", bizType);
                         // 时间戳格式不行
                         temp.setObject("create_time", DateUtil.dateToStr(new Date(), "yyyy-MM-dd HH:mm:ss"));
                         return temp;
@@ -168,7 +160,7 @@ public class ContactAdaptor {
         }
     }
 
-    public Integer getNoConnPotCusNum(PlatformPotentialCustomerOutDTO result, String enterpriseId, String storeId, ClerkDTO clerkDTO, Integer bizType,boolean unassigned) {
+    public Integer getNoConnPotCusNum(PlatformPotentialCustomerOutDTO result, String enterpriseId, String storeId, ClerkDTO clerkDTO, boolean unassigned) {
         if (StringUtils.isBlank(storeId) && clerkDTO == null) {
             return 0;
         }
@@ -184,22 +176,14 @@ public class ContactAdaptor {
             }
         }
         ContactParamDTO contact = new ContactParamDTO();
-        if (result != null) {
-            contact.setRuleJSON(JSON.toJSONString(result));
-        }
+        contact.setRuleJSON(JSON.toJSONString(result));
         contact.setContactType(0);
-        contact.setBizType(bizType);
         params.setStoreId(storeId);
         params.setClerkId(clerkId);
         params.setClerkType(clerkTypeStr);
         params.setEnterpriseId(enterpriseId);
         params.setContactParamDTO(contact);
         MemberInfoListParamsDTO memberInfoListParamsDTO = new MemberInfoListParamsDTO();
-        if (Objects.equals(bizType, ContactBizTypeEnum.OPPORTUNITY_CUSTOMER.getType())) {
-            memberInfoListParamsDTO.setCrowdClerkId(clerkId);
-            memberInfoListParamsDTO.setCrowdType(-1);
-            memberInfoListParamsDTO.setMemberType(4);
-        }
         // 查询无归属数据
         if (unassigned) {
             FilterListDTO filterListDTO = new FilterListDTO();

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

@@ -2,9 +2,7 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.haoban.manage.api.dto.CommonDataMQDTO;
-import com.gic.haoban.manage.api.enums.contact.ContactBizTypeEnum;
 import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
 import com.gic.haoban.manage.api.service.HaobanTimerApiService;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
@@ -214,7 +212,6 @@ public class HaobanTimerApiServiceImpl implements HaobanTimerApiService {
 
     @Override
     public void contactDataTimer(String params) {
-        contactAdaptor.contactDataTimer(ContactBizTypeEnum.POTENTIAL_CUSTOMER.getType(), EnterpriseServiceEnum.POTENTIAL.getRightMenuCode());
-        contactAdaptor.contactDataTimer(ContactBizTypeEnum.OPPORTUNITY_CUSTOMER.getType(), EnterpriseServiceEnum.OBJECTIVES.getRightMenuCode());
+        contactAdaptor.contactDataTimer();
     }
 }