1

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

@@ -880,10 +880,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
         switch (orderBy) {
             case "price-asc":
-                orderBy = "tbpt.start_price ASC";
+                orderBy = "tb.price ASC";
                 break;
-            case "desc-asc":
-                orderBy = "tbpt.end_price DESC";
+            case "price-desc":
+                orderBy = "tb.price DESC";
                 break;
             case "openingDate-asc":
                 orderBy = "tb.opening_date ASC";

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

@@ -439,6 +439,39 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setRemark(channelReportDTO.getRemark());
         channelCustomer.setRealtyConsultant(channelReportDTO.getRealtyConsultant());
         channelCustomerMapper.insert(channelCustomer);
+
+        // 插入客户来源逻辑, 防止下面 if 里面的 return
+        // 首次报备的客户, 写入客户来源表
+        TaCustomerFrom customerFrom = null;
+        if (!StringUtils.isEmpty(channelCustomer.getBuildingId())) {
+            Map<String, Number> counter = taCustomerFromMapper.countPerson(channelCustomer.getOrgId(), channelCustomer.getBuildingId(), channelCustomer.getPersonId());
+            boolean orgFirst = counter.get("orgCount").longValue() < 1;
+            boolean projectFirst = counter.get("projectCount").longValue() < 1;
+            if (projectFirst) {
+                TaBuilding taBuilding = taBuildingMapper.selectById(channelCustomer.getBuildingId());
+
+                customerFrom = new TaCustomerFrom();
+                customerFrom.setPersonId(channelCustomer.getPersonId());
+                customerFrom.setCustomerId(channelCustomer.getCustomerId());
+                customerFrom.setPersonName(channelCustomer.getName());
+                customerFrom.setOrgId(channelCustomer.getOrgId());
+//              customerFrom.setSceneId(sceneId);
+                customerFrom.setIsOrgFirst(orgFirst);
+                QueryWrapper<TaCustomerFrom> fromQueryWrapper = new QueryWrapper<TaCustomerFrom>();
+                fromQueryWrapper.eq("person_id", channelCustomer.getPersonId());
+                fromQueryWrapper.eq("org_id", channelCustomer.getOrgId());
+                fromQueryWrapper.eq("building_id", channelCustomer.getBuildingId());
+                if (taCustomerFromMapper.selectList(fromQueryWrapper).size() < 1) {
+                    customerFrom.setIsProjectFirst(true);
+                }
+                customerFrom.setCreateDate(LocalDateTime.now());
+                customerFrom.setBuildingId(channelCustomer.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setSharePersonId(channelCustomer.getPersonId());
+                customerFrom.setSharePersonName(channelCustomer.getName());
+                taCustomerFromMapper.insert(customerFrom);
+            }
+        }
         return ResponseBean.success(channelCustomer);
     }
 

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.mapper.TaBuildingMapper;
 import com.yunzhi.marketing.mapper.TaPersonMapper;
 import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
 import com.yunzhi.marketing.po.MineRecommendCustomerPO;
@@ -50,6 +52,9 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
     @Autowired
     private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
     /**
      * 审核
      *
@@ -88,14 +93,16 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
         TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
         if (null == recommendCustomer) {
+            TaBuilding building = taBuildingMapper.selectById(customer.getBuildingId());
             // 进业务客户表
             TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-            taRecommendCustomer.setName(customerVisit.getName());
+            taRecommendCustomer.setName(customer.getName());
             taRecommendCustomer.setPicture(customer.getPicture());
             taRecommendCustomer.setPhone(customer.getPhone());
             taRecommendCustomer.setSex(customer.getSex());
             taRecommendCustomer.setRecommendPerson(customer.getRecommendPerson());
             taRecommendCustomer.setBuildingId(customer.getBuildingId());
+            taRecommendCustomer.setIntention(building.getBuildingName());
             taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
             taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             taRecommendCustomer.setCreateDate(LocalDateTime.now());
@@ -175,6 +182,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
             TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
             if (null == recommendCustomer) {
+                TaBuilding building = taBuildingMapper.selectById(customer.getBuildingId());
                 // 进业务客户表
                 TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
                 taRecommendCustomer.setName(customerVisit.getName());
@@ -183,6 +191,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 taRecommendCustomer.setSex(customer.getSex());
                 taRecommendCustomer.setRecommendPerson(customer.getRecommendPerson());
                 taRecommendCustomer.setBuildingId(customer.getBuildingId());
+                taRecommendCustomer.setIntention(building.getBuildingName());
                 taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
                 taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
                 taRecommendCustomer.setCreateDate(LocalDateTime.now());