Merge branch 'feature-recommend' into 'master'

Feature recommend

See merge request !2786

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/PotentialDataController.java

@@ -10,7 +10,9 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.haoban.app.customer.dto.ChildDTO;
 import com.gic.haoban.app.customer.dto.CustomerDTO;
+import com.gic.haoban.app.customer.dto.FilterListDTO;
 import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
 import com.gic.haoban.app.customer.dto.contact.ContactParamDTO;
 import com.gic.haoban.app.customer.dto.contact.ContactSumDTO;
@@ -202,8 +204,10 @@ public class PotentialDataController {
                 ClerkDTO clerkDTO = clerkMap.get(x.getClerkId());
                 StoreDTO storeDTO = storeMap.get(x.getStoreId());
                 if (!weekMonth) {
+                    // 无归属导购
+                    boolean unassigned = Objects.equals(x.getClerkId(), "-1") ? true : false;
                     // 实时获取当前未建联数 todo
-                    Integer noConnPotCusNum = getNoConnPotCusNum(potentialResponse, enterpriseId, wxEnterpriseId, storeDTO, clerkDTO);
+                    Integer noConnPotCusNum = getNoConnPotCusNum(potentialResponse, enterpriseId, wxEnterpriseId, storeDTO, clerkDTO,unassigned);
                     x.setNoConnPotCusNum(noConnPotCusNum);
                 }
                 PotentialContactDetailOverviewVO overviewVO = new PotentialContactDetailOverviewVO();
@@ -222,7 +226,7 @@ public class PotentialDataController {
         return RestResponse.successResult(res);
     }
 
-    private Integer getNoConnPotCusNum(ServiceResponse<PlatformPotentialCustomerOutDTO> potentialResponse, String enterpriseId,String wxEnterpriseId,StoreDTO storeDTO,ClerkDTO clerkDTO) {
+    private Integer getNoConnPotCusNum(ServiceResponse<PlatformPotentialCustomerOutDTO> potentialResponse, String enterpriseId,String wxEnterpriseId,StoreDTO storeDTO,ClerkDTO clerkDTO,boolean unassigned) {
         if (storeDTO == null && clerkDTO == null) {
             return 0;
         }
@@ -250,10 +254,21 @@ public class PotentialDataController {
         params.setEnterpriseId(enterpriseId);
         params.setWxEnterpriseId(wxEnterpriseId);
         params.setContactParamDTO(contact);
-        ServiceResponse<ContactSumDTO> noContactResponse = customerService.contactMemberSum(new com.gic.haoban.base.api.common.BasePageInfo(), params, new MemberInfoListParamsDTO());
+        MemberInfoListParamsDTO memberInfoListParamsDTO = new MemberInfoListParamsDTO();
+        // 查询无归属数据
+        if (unassigned) {
+            FilterListDTO filterListDTO = new FilterListDTO();
+            filterListDTO.setFilterType("1");
+            ChildDTO child = new ChildDTO();
+            child.setId("-1");
+            filterListDTO.setChild(child);
+            memberInfoListParamsDTO.setFilterList(Lists.newArrayList(filterListDTO));
+        }
+        ServiceResponse<ContactSumDTO> noContactResponse = customerService.contactMemberSum(new com.gic.haoban.base.api.common.BasePageInfo(), params, memberInfoListParamsDTO);
         return noContactResponse.getResult() != null ? noContactResponse.getResult().getTotalCount() : 0;
     }
 
+
     /**
      * 转化明细概览 周/月报
      *