1040 bug 回退

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -547,99 +547,63 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 查询置业授权的楼盘
         QueryWrapper<TaPersonBuilding> query2 = new QueryWrapper<>();
         query2.eq("user_id", consultant.getUserId());
-        query2.eq("building_id", reportCust.getBuildingId());
         List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingMapper.selectList(query2);
         if (taPersonBuildingList.size() < 1) {
-            // 报备其他楼盘的客户
-            // 查询楼盘下是否有该客户
-            QueryWrapper<TaRecommendCustomer> query3 = new QueryWrapper<>();
-            query3.eq("phone", phone);
-            query3.eq("building_id", reportCust.getBuildingId());
-            query3.eq("org_id", orgId);
-            List<TaRecommendCustomer> lst = list(query3);
-            if (lst.size() > 0) {
-                throw new Exception("当前人员是已被报备");
-            } else {
-                // 如果表中无此人员数据
-                recommendCustomer = new TaRecommendCustomer();
-
-                recommendCustomer.setOrgId(orgId);
-                recommendCustomer.setName(reportCust.getName());
-                recommendCustomer.setPicture(null != custPerson ? custPerson.getAvatarurl() : null);
-                recommendCustomer.setPhone(phone);
-                recommendCustomer.setSex(reportCust.getSex());
-//                recommendCustomer.setRealtyConsultant();
-                recommendCustomer.setBuildingId(reportCust.getBuildingId());
-                TaBuilding building = taBuildingMapper.selectById(reportCust.getBuildingId());
-                recommendCustomer.setIntention(building.getBuildingName());
-                recommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
-                recommendCustomer.setCreateDate(LocalDateTime.now());
-                recommendCustomer.setReportDate(LocalDateTime.now());
-                recommendCustomer.setPersonId(null != custPerson ? custPerson.getPersonId() : null);
-                recommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-                recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-                recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
-                recommendCustomer.setRecommendPerson(consultant.getPersonId());
-                recommendCustomer.setCirculationTime(LocalDateTime.now());
-                recommendCustomer.setInstitutionId(building.getInstitutionId());
-                customerFrom.setIsProjectFirst(true);
-                customerFrom.setIsOrgFirst(true);
-            }
-        }else {
-            TaPersonBuilding taPersonBuilding = taPersonBuildingList.get(0);
-
-            // 查询楼盘下是否有该客户
-            QueryWrapper<TaRecommendCustomer> query3 = new QueryWrapper<>();
-            query3.eq("phone", phone);
-            query3.eq("building_id", taPersonBuilding.getBuildingId());
-            query3.eq("org_id", orgId);
-            List<TaRecommendCustomer> lst = list(query3);
-            if (lst.size() > 0) {
-                TaRecommendCustomer orign = lst.get(0);
-                if (!StringUtils.isEmpty(orign.getRealtyConsultant())) {
-                    // 如果当前人员已经是当前置业的私客
-                    if (orign.getRealtyConsultant().equals(consultantUser)) {
-                        return;
-                    } else {
-                        throw new Exception("当前人员是其他置业的私客");
-                    }
+            throw new Exception("置业未绑定楼盘");
+        }
+        TaPersonBuilding taPersonBuilding = taPersonBuildingList.get(0);
+
+        // 查询楼盘下是否有该客户
+        QueryWrapper<TaRecommendCustomer> query3 = new QueryWrapper<>();
+        query3.eq("phone", phone);
+        query3.eq("building_id", taPersonBuilding.getBuildingId());
+        query3.eq("org_id", orgId);
+        List<TaRecommendCustomer> lst = list(query3);
+        if (lst.size() > 0) {
+            TaRecommendCustomer orign = lst.get(0);
+            if (!StringUtils.isEmpty(orign.getRealtyConsultant())) {
+                // 如果当前人员已经是当前置业的私客
+                if (orign.getRealtyConsultant().equals(consultantUser)) {
+                    return;
                 } else {
-                    // 如果是项目公客, 则直接绑定为当前置业的私客
-                    orign.setRealtyConsultant(consultantUser);
-                    orign.setVerifyStatus(CommConstant.VERIFY_AGREE);
-                    orign.setStatus(CommConstant.CUSTOMER_VISITE);
-                    orign.setEntryType(CommConstant.ENTRY_VERIFY);
-                    orign.setReportDate(LocalDateTime.now());
-                    recommendCustomer = orign;
-//                updateById(orign);
-//                return;
+                    throw new Exception("当前人员是其他置业的私客");
                 }
             } else {
-                // 如果表中无此人员数据
-                recommendCustomer = new TaRecommendCustomer();
-
-                recommendCustomer.setOrgId(orgId);
-                recommendCustomer.setName(reportCust.getName());
-                recommendCustomer.setPicture(null != custPerson ? custPerson.getAvatarurl() : null);
-                recommendCustomer.setPhone(phone);
-                recommendCustomer.setSex(reportCust.getSex());
-                recommendCustomer.setRealtyConsultant(consultantUser);
-                recommendCustomer.setBuildingId(taPersonBuilding.getBuildingId());
-                TaBuilding building = taBuildingMapper.selectById(taPersonBuilding.getBuildingId());
-                recommendCustomer.setIntention(building.getBuildingName());
-                recommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
-                recommendCustomer.setCreateDate(LocalDateTime.now());
-                recommendCustomer.setReportDate(LocalDateTime.now());
-                recommendCustomer.setPersonId(null != custPerson ? custPerson.getPersonId() : null);
-                recommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-                recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-                recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
-                recommendCustomer.setRecommendPerson(consultant.getPersonId());
-                recommendCustomer.setCirculationTime(LocalDateTime.now());
-                recommendCustomer.setInstitutionId(building.getInstitutionId());
-                customerFrom.setIsProjectFirst(true);
-                customerFrom.setIsOrgFirst(true);
+                // 如果是项目公客, 则直接绑定为当前置业的私客
+                orign.setRealtyConsultant(consultantUser);
+                orign.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                orign.setStatus(CommConstant.CUSTOMER_VISITE);
+                orign.setEntryType(CommConstant.ENTRY_VERIFY);
+                orign.setReportDate(LocalDateTime.now());
+                recommendCustomer = orign;
+//                updateById(orign);
+//                return;
             }
+        } else {
+            // 如果表中无此人员数据
+            recommendCustomer = new TaRecommendCustomer();
+
+            recommendCustomer.setOrgId(orgId);
+            recommendCustomer.setName(reportCust.getName());
+            recommendCustomer.setPicture(null != custPerson ? custPerson.getAvatarurl() : null);
+            recommendCustomer.setPhone(phone);
+            recommendCustomer.setSex(reportCust.getSex());
+            recommendCustomer.setRealtyConsultant(consultantUser);
+            recommendCustomer.setBuildingId(taPersonBuilding.getBuildingId());
+            TaBuilding building = taBuildingMapper.selectById(taPersonBuilding.getBuildingId());
+            recommendCustomer.setIntention(building.getBuildingName());
+            recommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
+            recommendCustomer.setCreateDate(LocalDateTime.now());
+            recommendCustomer.setReportDate(LocalDateTime.now());
+            recommendCustomer.setPersonId(null != custPerson ? custPerson.getPersonId() : null);
+            recommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
+            recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+            recommendCustomer.setRecommendPerson(consultant.getPersonId());
+            recommendCustomer.setCirculationTime(LocalDateTime.now());
+            recommendCustomer.setInstitutionId(building.getInstitutionId());
+            customerFrom.setIsProjectFirst(true);
+            customerFrom.setIsOrgFirst(true);
         }
 
         if (StringUtils.isEmpty(recommendCustomer.getCustomerId())) {