1.整合

fs-company/src/main/java/com/fs/crm/controller/CrmCustomerController.java

@@ -20,7 +20,6 @@ import com.fs.core.web.service.TokenService;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.param.*;
 import com.fs.crm.service.ICrmCustomerAssistService;
-import com.fs.crm.service.ICrmCustomerContactsService;
 import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.service.ICrmCustomerUserService;
 import com.fs.crm.service.impl.CrmCustomerAssistServiceImpl;
@@ -471,7 +470,7 @@ public class CrmCustomerController extends BaseController
         if(customer==null){
             CrmCustomerContacts contactsMap=new CrmCustomerContacts();
             contactsMap.setMobile(mobile);
-            List<CrmCustomerContacts>  contactsList=crmContactsService.selectCrmCustomerContactsList(contactsMap);
+            List<CrmCustomerContacts>  contactsList=crmCustomerAssistService.selectCrmCustomerContactsList(contactsMap);
             if(contactsList.size()>0){
                 CrmCustomerContacts contacts=contactsList.get(0);
                 customerId=contacts.getCustomerId();

fs-service-system/src/main/java/com/fs/crm/service/ICrmCustomerAssistService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.fs.common.core.domain.R;
 import com.fs.crm.domain.CrmCustomerAssist;
+import com.fs.crm.domain.CrmCustomerContacts;
 import com.fs.crm.param.CrmCustomeAssignParam;
 import com.fs.crm.param.CrmCustomerAssistDeLParam;
 import com.fs.crm.param.CrmCustomerAssistOperationParam;
@@ -72,4 +73,6 @@ public interface ICrmCustomerAssistService
     List<CrmCustomerAssistVo> selectByCustomerIds(List<Long> customerIds);
 
     int allOperation(List<CrmCustomerAssistOperationParam> params,Long companyId,Long companyUserId);
+
+    List<CrmCustomerContacts> selectCrmCustomerContactsList(CrmCustomerContacts contactsMap);
 }

fs-service-system/src/main/java/com/fs/crm/service/impl/CrmCustomerAssistServiceImpl.java

@@ -12,14 +12,10 @@ import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyUserMapper;
-import com.fs.crm.domain.CrmCustomer;
-import com.fs.crm.domain.CrmCustomerLogs;
-import com.fs.crm.domain.CrmCustomerUser;
+import com.fs.crm.domain.*;
 import com.fs.crm.dto.CrmCustomerAssignUserDTO;
 import com.fs.crm.enums.CustomerLogEnum;
-import com.fs.crm.mapper.CrmCustomerLogsMapper;
-import com.fs.crm.mapper.CrmCustomerMapper;
-import com.fs.crm.mapper.CrmCustomerUserMapper;
+import com.fs.crm.mapper.*;
 import com.fs.crm.param.CrmCustomeAssignParam;
 import com.fs.crm.param.CrmCustomerAssistDeLParam;
 import com.fs.crm.param.CrmCustomerAssistOperationParam;
@@ -27,8 +23,6 @@ import com.fs.crm.vo.CrmCustomerAssistVo;
 import com.fs.jpush.service.JpushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.fs.crm.mapper.CrmCustomerAssistMapper;
-import com.fs.crm.domain.CrmCustomerAssist;
 import com.fs.crm.service.ICrmCustomerAssistService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +38,8 @@ public class CrmCustomerAssistServiceImpl implements ICrmCustomerAssistService
     @Autowired
     private CrmCustomerAssistMapper crmCustomerAssistMapper;
     @Autowired
+    private CrmCustomerContactsMapper crmCustomerContactsMapper;
+    @Autowired
     private CompanyUserMapper companyUserMapper;
     @Autowired
     private CrmCustomerMapper crmCustomerMapper;
@@ -312,4 +308,9 @@ public class CrmCustomerAssistServiceImpl implements ICrmCustomerAssistService
         });
         return count.get();
     }
+    @Override
+    public List<CrmCustomerContacts> selectCrmCustomerContactsList(CrmCustomerContacts crmCustomerContacts)
+    {
+        return crmCustomerContactsMapper.selectCrmCustomerContactsList(crmCustomerContacts);
+    }
 }