Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

 	}
 
 	public boolean validateWeight(TaUser taUser, String operateType){
+		if (StringUtils.isEmpty(taUser.getWeight())){
+			return false;
+		}
+
 		Integer count;
 		if(taUser.getIsConsultant() != null && taUser.getIsConsultant()){
 			String buildingId = taUser.getBuildingId();

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaBuildingProjectTypeMapper;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.map.HashedMap;
 import org.slf4j.Logger;
     private ITaRecommendCustomerService taRecommendCustomerService;
     @Autowired
     public ITaPersonFromRecordService iTaPersonFromRecordService;
+    @Autowired
+    private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
 
 
     /**
                     e.setNewsNum(shareNum);
                     break;
                 case CommConstant.FAVOR_PROJECT:
+                    //获取项目类型里的价格
+                    QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
+                    projectTypeQueryWrapper.eq("building_id",e.getTargetId());
+                    projectTypeQueryWrapper.eq("building_type_id",e.getBuildingTypeId());
+                    TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
+                    //价格相同显示一个否则显示区间
+                    if (null != taBuildingProjectType){
+                        Integer startPrice = taBuildingProjectType.getStartPrice();
+                        Integer endPrice = taBuildingProjectType.getEndPrice();
+                        if (null != startPrice && null == endPrice){
+                            e.setPrice(String.valueOf(startPrice));
+                        }else if (null == startPrice && null != endPrice){
+                            e.setPrice(String.valueOf(endPrice));
+                        }else if(null != startPrice && null != endPrice){
+                            if (startPrice.equals(endPrice)){
+                                e.setPrice(String.valueOf(startPrice));
+                            }else{
+                                e.setPrice(startPrice + "--" + endPrice);
+                            }
+                        }else{
+                            e.setPrice(null);
+                        }
+                        e.setPriceType(taBuildingProjectType.getPriceType());
+                    } else {
+                        e.setPrice(null);
+                    }
                     e.setBuildingNum(shareNum);
                     break;
                 case CommConstant.EVENT_H5:

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

      * 户型类型id
      */
     private Integer buildingTypeId;
+
+    /**
+     * 价格类型
+     */
+    @TableField(exist = false)
+    private String priceType;
+
+    /**
+     * 项目亮点
+     */
+    private String highlights;
 }

src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java

     private Integer newsNum;
 
     private Integer drainageShareNum;
+
+    private Integer buildingTypeId;
+
+    private String priceType;
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

 
                 List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(queryListWrapper);
                 taBuilding.setBuildingListImg(buildingListImg);
+
+                //获取项目类型里的价格
+                QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
+                projectTypeQueryWrapper.eq("building_id",taBuilding.getBuildingId());
+                projectTypeQueryWrapper.eq("building_type_id",taBuilding.getBuildingTypeId());
+                TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
+                //价格相同显示一个否则显示区间
+                if (null != taBuildingProjectType){
+                    Integer startPrice = taBuildingProjectType.getStartPrice();
+                    Integer endPrice = taBuildingProjectType.getEndPrice();
+                    if (null != startPrice && null == endPrice){
+                        taBuilding.setPrice(String.valueOf(startPrice));
+                    }else if (null == startPrice && null != endPrice){
+                        taBuilding.setPrice(String.valueOf(endPrice));
+                    }else if(null != startPrice && null != endPrice){
+                       if (startPrice.equals(endPrice)){
+                           taBuilding.setPrice(String.valueOf(startPrice));
+                       }else{
+                           taBuilding.setPrice(startPrice + "--" + endPrice);
+                       }
+                    }else{
+                        taBuilding.setPrice(null);
+                    }
+                    taBuilding.setPriceType(taBuildingProjectType.getPriceType());
+                } else {
+                    taBuilding.setPrice(null);
+                }
             }
         }
 
         projectTypeQueryWrapper.eq("status", 1);
         List<TaBuildingProjectType> buildingProjectTypes = taBuildingProjectTypeMapper.selectList(projectTypeQueryWrapper);
         building.setBuildingProjectType(buildingProjectTypes);
+        building.setPrice(null);
+        buildingProjectTypes.forEach(e -> {
+            if (e.getBuildingTypeId().equals(building.getBuildingTypeId())){
+                //价格相同显示一个否则显示区间
+                Integer startPrice = e.getStartPrice();
+                Integer endPrice = e.getEndPrice();
+                if (null != startPrice && null == endPrice){
+                    building.setPrice(String.valueOf(startPrice));
+                }else if (null == startPrice && null != endPrice){
+                    building.setPrice(String.valueOf(endPrice));
+                }else if(null != startPrice && null != endPrice){
+                    if (startPrice.equals(endPrice)){
+                        building.setPrice(String.valueOf(startPrice));
+                    }else{
+                        building.setPrice(startPrice + "--" + endPrice);
+                    }
+                }else{
+                    building.setPrice(null);
+                }
+                building.setPriceType(e.getPriceType());
+            }
+        });
 
         // 海报和分享
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
                     }
                 }
 
-
+                //获取项目类型里的价格
+                QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
+                projectTypeQueryWrapper.eq("building_id",build.getBuildingId());
+                projectTypeQueryWrapper.eq("building_type_id",build.getBuildingTypeId());
+                TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
+                //价格相同显示一个否则显示区间
+                if (null != taBuildingProjectType){
+                    Integer startPrice = taBuildingProjectType.getStartPrice();
+                    Integer endPrice = taBuildingProjectType.getEndPrice();
+                    if (null != startPrice && null == endPrice){
+                        build.setPrice(String.valueOf(startPrice));
+                    }else if (null == startPrice && null != endPrice){
+                        build.setPrice(String.valueOf(endPrice));
+                    }else if(null != startPrice && null != endPrice){
+                        if (startPrice.equals(endPrice)){
+                            build.setPrice(String.valueOf(startPrice));
+                        }else{
+                            build.setPrice(startPrice + "--" + endPrice);
+                        }
+                    }else{
+                        build.setPrice(null);
+                    }
+                    build.setPriceType(taBuildingProjectType.getPriceType());
+                } else {
+                    build.setPrice(null);
+                }
             }
         }
 
             IPage<TaShare> pageSN = new Page<>(1, 10);
             pageSN.setTotal(null == building.getShareNum() ? 0l : building.getShareNum());
             building.setShareList(pageSN);
+
+            //获取项目类型里的价格
+            QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
+            projectTypeQueryWrapper.eq("building_id",building.getBuildingId());
+            projectTypeQueryWrapper.eq("building_type_id",building.getBuildingTypeId());
+            TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
+            //价格相同显示一个否则显示区间
+            if (null != taBuildingProjectType){
+                Integer startPrice = taBuildingProjectType.getStartPrice();
+                Integer endPrice = taBuildingProjectType.getEndPrice();
+                if (null != startPrice && null == endPrice){
+                    building.setPrice(String.valueOf(startPrice));
+                }else if (null == startPrice && null != endPrice){
+                    building.setPrice(String.valueOf(endPrice));
+                }else if(null != startPrice && null != endPrice){
+                    if (startPrice.equals(endPrice)){
+                        building.setPrice(String.valueOf(startPrice));
+                    }else{
+                        building.setPrice(startPrice + "--" + endPrice);
+                    }
+                }else{
+                    building.setPrice(null);
+                }
+                building.setPriceType(taBuildingProjectType.getPriceType());
+            } else {
+                building.setPrice(null);
+            }
         }
 
         IPage<TaBuilding> page = new Page<>(1, 10);

src/main/resources/mapper/TaBuildingMapper.xml

                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                             (
                                 <if test='priceArr[0] != null and priceArr[0] != ""'>
-                                    <![CDATA[ startPrice >= ${priceArr[0]}  ]]>
+                                    <![CDATA[ start_price >= ${priceArr[0]}  ]]>
                                 </if>
                                 <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
                                     AND
                                 </if>
                                 <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
-                                    <![CDATA[ endPrice <= ${priceArr[1]}  ]]>
+                                    <![CDATA[ end_price <= ${priceArr[1]}  ]]>
                                 </if>
                             )
                         </foreach>

src/main/resources/mapper/TaPersonMapper.xml

             and p.building_id = #{buildingId}
         </if>
         ORDER BY
+            u.weight desc,
             t.create_date DESC
     </select>
 
             </foreach>
         </if>
         ORDER BY
+        u.weight desc,
         t.create_date DESC
     </select>
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

                 a.building_name,
                 a.address,
                 a.price,
+                a.building_type_id,
                 t.tagert_type as eventType,
 				t.create_date as visit_time
                 from ta_share t
-                left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
+                left join (select b.url, a.building_name,a.address,a.price,a.building_id,a.building_type_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
                 where t.tagert_type = 'project'
                 and t.person_id = #{personId} order by t.create_date desc limit 9999
             ) t
         '1' as price,
         '2' as building_name,
         '3' as address,
+        1 as building_type_id,
         t.tagert_type as eventType,
 		t.create_date as visit_time
         from ta_share t
         '1' as price,
         '2' as building_name,
         '3' as address,
+        1 as building_type_id,
         t.tagert_type as eventType,
 		t.create_date as visit_time
         from ta_share t
         '1' as price,
         '2' as building_name,
         '3' as address,
+        1 as building_type_id,
         t.tagert_type as eventType,
 		t.create_date as visit_time
         from ta_share t
         '1' as price,
         '2' as building_name,
         '3' as address,
+        1 as building_type_id,
         t.tagert_type as eventType,
 		t.create_date as visit_time
         from ta_share t
             '1' as price,
             '2' as building_name,
             '3' as address,
+            1 as building_type_id,
 			t.tagert_type as eventType,
 			t.create_date as visit_time
             from ta_share t

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         c.building_name as intentionName
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0