Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUserVO.java

      */
     @TableField(exist = false)
     private String bossDisplay;
+
+    /**
+     * ta_user 的 userId
+     */
+    @TableField(exist = false)
+    private Integer realUserId;
 }

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

         }
         switch (orderBy) {
             case "price-asc":
-                orderBy = "tbpt.start_price ASC";
+                orderBy = "IFNULL(tbpt.price_type,\"z\") , ifnull(CONVERT(tbpt.start_price, UNSIGNED INTEGER), 9999999999999)";
                 break;
             case "price-desc":
-                orderBy = "tbpt.end_price DESC";
+                orderBy = "tbpt.price_type desc, CONVERT(tbpt.end_price, UNSIGNED INTEGER) DESC";
                 break;
             case "openingDate-asc":
                 orderBy = "tb.opening_date ASC";

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

         if (typeOf.equals("card")) {
             taPersonMapper.setFieldIncrement(taPerson.getPersonId(),"like_num", -1);
         }
+        if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
+            taPersonMapper.setFieldIncrement(like,"like_num", -1);
+        }
 
         // 如果是收藏资讯, 则 - 1
         if (typeOf.equals(CommConstant.FAVOR_NEWS)) {

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

             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<>();
         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);
     }
 

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java

                 customerInfo = new CustomerInfo();
             }
             customerInfo.setName(customer.getName());
-            customerInfo.setSex(customer.getSex());
+//            customerInfo.setSex(customer.getSex());
             customerInfo.setPhone(customer.getPhone());
             customerInfo.setPicture(customer.getPicture());
 
                 customerInfoVO.setRealtyConsultantPerson(realtyPerson);
                 // 所属楼盘和 用户信息
                 LambdaQueryWrapper<TaPersonBuilding> taPersonBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant());
+                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant()).or().eq(TaPersonBuilding::getUserId,realtyPerson.getUserId());
                 List<TaPersonBuilding> list = taPersonBuildingService.list(taPersonBuildingLambdaQueryWrapper);
                 if (list.size() > 0) {
                     TaUser taUser = taUserService.getById(list.get(0).getUserId());

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

         }
         customerPreparatory.setOrgId(taRecommendCustomer.getOrgId());
         customerPreparatory.setCustomerId(taRecommendCustomer.getCustomerId());
-        customerPreparatoryMapper.insert(customerPreparatory);
+        if (StringUtils.isEmpty(customerPreparatory.getCustomerPreparatoryId())) {
+            customerPreparatoryMapper.insert(customerPreparatory);
+        }else {
+            customerPreparatoryMapper.updateById(customerPreparatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 
         customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setCreateDate(LocalDateTime.now());
         customerSignatory.setType("commission");
-        customerSignatoryMapper.insert(customerSignatory);
+        customerSignatory.setCustomerId(params.getCustomerId());
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())){
+            customerSignatoryMapper.insert(customerSignatory);
+        }else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 
         }
         customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setType("signatory");
-        customerSignatoryMapper.insert(customerSignatory);
+        customerSignatory.setCustomerId(params.getCustomerId());
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())) {
+            customerSignatoryMapper.insert(customerSignatory);
+        }else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 

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

     }
 
     private Integer[] getUnitPriceRange(Integer minPriceW, Integer maxPriceW, Integer areaResultId) {
-        Integer minPrice = minPriceW * 10000;
-        Integer maxPrice = maxPriceW * 10000;
+        Integer minPrice = minPriceW;
+        Integer maxPrice = maxPriceW;
 
         // 字典过滤 - 必须与小程序端保持一致
         switch (areaResultId) {
                 break;
         }
 
-        return new Integer[] {minPrice, maxPrice};
+        return new Integer[] {minPrice * 10000, maxPrice * 10000};
     }
 }

src/main/resources/mapper/TaBuildingMapper.xml

         SELECT * FROM ta_building
         <where>
             1 =1
-            and status = 1
+            and status != -1
             <if test="Name != null and Name != ''">
                 and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>

src/main/resources/mapper/TaUserMapper.xml

     <select id="selectPageList" resultType="com.yunzhi.marketing.center.taUser.entity.TaUserVO">
         SELECT
             s.person_id as user_id,
+            t.user_id as real_user_id,
             t.*
         FROM
             ta_user t

src/main/resources/mapper/xlk/SearchHouseMapper.xml

         <if test="params.status != null and params.status != ''">
             and t.status = #{params.status}
         </if>
+        order by CREATED_TIME desc
     </select>
     <select id="selectSearchHouseDetail" resultType="com.yunzhi.marketing.xlk.vo.SearchHouseVO">
         SELECT