调整

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

@@ -774,22 +774,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             lambdaQueryWrapper.eq(CustomerVisit::getCustomerId,taRecommendCustomer.getCustomerId());
             CustomerVisit customerVisit = customerVisitMapper.selectOne(lambdaQueryWrapper);
             taRecommendCustomerVO.setCustomerVisit(customerVisit);
-        }else if (CommConstant.CUSTOMER_PREPARATORY.equals(taRecommendCustomer.getStatus())) {
-            // 认筹状态
-            LambdaQueryWrapper<CustomerPreparatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(CustomerPreparatory::getCustomerId,taRecommendCustomer.getCustomerId());
-            CustomerPreparatory customerPreparatory = customerPreparatoryMapper.selectOne(lambdaQueryWrapper);
-            taRecommendCustomerVO.setCustomerPreparatory(customerPreparatory);
-        }else if (CommConstant.CUSTOMER_SIGNED.equals(taRecommendCustomer.getStatus())) {
-            // 签约状态
-            LambdaQueryWrapper<CustomerSignatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
-            List<CustomerSignatory> customerSignatories = customerSignatoryMapper.selectList(lambdaQueryWrapper);
-            customerSignatories.forEach(e -> {
-                TaBuildingApartment taBuildingApartment = taBuildingApartmentMapper.selectById(e.getHouseType());
-                e.setBuildingApartment(taBuildingApartment);
-            });
-            taRecommendCustomerVO.setCustomerSignatory(customerSignatories);
         }
 
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -798,6 +782,22 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null != customer) {
             taRecommendCustomerVO.setChannelCustomer(customer);
         }
+        // 认筹状态
+        LambdaQueryWrapper<CustomerPreparatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CustomerPreparatory::getCustomerId,taRecommendCustomer.getCustomerId());
+        CustomerPreparatory customerPreparatory = customerPreparatoryMapper.selectOne(lambdaQueryWrapper);
+        taRecommendCustomerVO.setCustomerPreparatory(customerPreparatory);
+
+        // 签约状态
+        LambdaQueryWrapper<CustomerSignatory> qylambdaQueryWrapper = new LambdaQueryWrapper<>();
+        qylambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
+        List<CustomerSignatory> customerSignatories = customerSignatoryMapper.selectList(qylambdaQueryWrapper);
+        customerSignatories.forEach(e -> {
+            TaBuildingApartment taBuildingApartment = taBuildingApartmentMapper.selectById(e.getHouseType());
+            e.setBuildingApartment(taBuildingApartment);
+        });
+        taRecommendCustomerVO.setCustomerSignatory(customerSignatories);
+
         return ResponseBean.success(taRecommendCustomerVO);
     }