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

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -112,7 +112,12 @@ public class TaUser implements Serializable {
     private String address;
     private String photo;
     private String description;
-    
+
+    /**
+     * 权重
+     */
+    private String weight;
+
     /**
      * 是否置业顾问
      */

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -29,4 +29,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
 
     IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
 }

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

@@ -378,7 +378,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (StringUtils.isEmpty(taUser.getLoginName())) {
 			taUser.setLoginName(taUser.getPhone());
 		}
-		
+
+		boolean weightCount = validateWeight(taUser, "add");
+		if(weightCount){
+			throw new Exception("同一项目下权重值不能重复");
+		}
+
 		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),null);
 		if (null != taUserList && taUserList.size() > 0) {
 			throw new Exception("电话号码或登录名重复");
@@ -443,10 +448,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (StringUtils.isEmpty(taUser.getUserName())) {
 			throw new Exception("用户名称不能为空");
 		}
+		if (!StringUtils.isEmpty(taUser.getWeight()) && taUser.getWeight().length() > 11){
+			throw new Exception("权重最大为11位");
+		}
 		if(StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
 			taUser.setLoginName(taUser.getPhone());
 		}
 
+		boolean weightCount = validateWeight(taUser, "update");
+		if(weightCount){
+			throw new Exception("同一项目下权重值不能重复");
+		}
+
 		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
 		wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
 		wrapper.eq("org_id",taUser.getOrgId());
@@ -625,4 +638,23 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		return this.update(updateWrapper);
 	}
+
+	public boolean validateWeight(TaUser taUser, String operateType){
+		Integer count;
+		if(taUser.getIsConsultant() != null && taUser.getIsConsultant()){
+			String buildingId = taUser.getBuildingId();
+			String weight = taUser.getWeight();
+			count = taUserMapper.validateWeight(null, buildingId, weight, operateType.equals("add") ? null : taUser.getUserId());
+		}else{
+			List<String> buildingIds = taUser.getBuildingIds();
+			String weight = taUser.getWeight();
+			count = taUserMapper.validateWeight(buildingIds, null, weight, operateType.equals("add") ? null : taUser.getUserId());
+		}
+
+		if (count > 0 ){
+			return true;
+		}
+		return false;
+	}
+
 }

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

@@ -268,6 +268,7 @@ public class TaBuildingController extends BaseController {
             @RequestParam(required = false) String buildingType, // 项目类型Id
             @RequestParam(required = false) String houseType, // 户型
             @RequestParam(required = false) String price,   // 价格
+            @RequestParam(required = false) String priceType,   // 价格类型
             @RequestParam(required = false) String area,    // 面积
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
@@ -292,7 +293,7 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
     }
 
 

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

@@ -308,4 +308,9 @@ public class TaBuilding implements Serializable {
      */
     @TableField(exist = false)
     private List<TaBuildingPanorama> panoramaList;
+
+    /**
+     * 户型类型id
+     */
+    private Integer buildingTypeId;
 }

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

@@ -57,5 +57,25 @@ public class TaBuildingProjectType implements Serializable {
 
     private String buildingTypeName;
 
+    /**
+     * 最低价
+     */
+    private Integer startPrice;
+
+    /**
+     * 最高价
+     */
+    private Integer endPrice;
+
+    /**
+     * 价格类型
+     */
+    private String priceType;
+
+    /**
+     * 销售状态
+     */
+    private String marketStatus;
+
 
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -77,7 +77,8 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("buildingTypeList") String[] buildingTypeList,
                                          @Param("priceList") List<String[]> priceList,
                                          @Param("areaList") List<String[]> areaList,
-                                         @Param("orgId")Integer orgId);
+                                         @Param("orgId")Integer orgId,
+                                         @Param("priceType") String priceType);
 
     /**
      * 根据项目类型Id 查询

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -127,7 +127,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId);
+            Integer orgId,String priceType);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -698,7 +698,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId) {
+            Integer orgId,String priceType) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         if(CollectionUtils.isEmpty(targets) && mine){
@@ -716,7 +716,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {

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

@@ -133,12 +133,15 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 			}
 
 			QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("user_id", e.getSharePersonId()).or().eq("person_id", e.getSharePersonId());
+			queryWrapper.eq("person_id", e.getSharePersonId());
 			TaPerson userShareInfo = taPersonMapper.selectOne(queryWrapper);
-			if (userShareInfo != null) {
-				e.setShareName(userShareInfo.getNickname());
-				e.setShareTel(userShareInfo.getPhone());
-			}
+
+			QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+			taPersonQueryWrapper.eq("user_id", e.getSharePersonId());
+			TaPerson taPersonUser = taPersonMapper.selectOne(taPersonQueryWrapper);
+
+			e.setShareName(userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
+			e.setShareTel(userShareInfo == null ? taPersonUser.getPhone() :userShareInfo.getPhone());
 
 			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getDrainageName());

src/main/resources/mapper/TaBuildingMapper.xml

@@ -133,18 +133,22 @@
                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                             (
                                 <if test='priceArr[0] != null and priceArr[0] != ""'>
-                                    <![CDATA[ price >= ${priceArr[0]}  ]]>
+                                    <![CDATA[ startPrice >= ${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[ price <= ${priceArr[1]}  ]]>
+                                    <![CDATA[ endPrice <= ${priceArr[1]}  ]]>
                                 </if>
                             )
                         </foreach>
                     </if>
 
+                    <if test="priceType != null and priceType != ''">
+                        and price_type = #{priceType}
+                    </if>
+
                     <if test="buildingTypeList != null and buildingTypeList.length > 0">
                         AND building_type_id in
                         <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">

src/main/resources/mapper/TaBuildingProjectTypeMapper.xml

@@ -4,11 +4,11 @@
 
     <insert id="insertBuildingProjectTypeBatch" parameterType="list" >
         insert into ta_building_project_type
-        (building_id, price, decoration, rights_year, status, building_type_id, building_type_name)
+        (building_id, price, decoration, rights_year, status, building_type_id, building_type_name, start_price, end_price, price_type, market_status)
         values
         <foreach collection="list" item="item" separator=",">
             (#{buildingId}, #{item.price}, #{item.decoration}, #{item.rightsYear}
-            , #{item.status}, #{item.buildingTypeId}, #{item.buildingTypeName})
+            , #{item.status}, #{item.buildingTypeId}, #{item.buildingTypeName} , #{item.startPrice}, #{item.endPrice}, #{item.priceType}, #{item.marketStatus})
         </foreach>
     </insert>
 

src/main/resources/mapper/TaPersonMapper.xml

@@ -50,7 +50,7 @@
         and t.org_id = #{orgId}
         and u.org_id = #{orgId}
         and u.status = 1
-        ORDER BY
+        ORDER BY u.weight desc,
             t.create_date DESC
     </select>
 

src/main/resources/mapper/TaUserMapper.xml

@@ -87,5 +87,28 @@
                 </foreach>
             </if>
             GROUP BY user_id
+            order by t.weight desc, create_date desc
     </select>
+
+    <select id="validateWeight" resultType="integer">
+      select count(*) from ta_user t
+      LEFT JOIN ta_person_building a on t.user_id = a.user_id
+      where 1=1
+      <if test="weight != null and weight != ''">
+          and t.weight = #{weight}
+      </if>
+      <if test="buildingIds != null and buildingIds.size() > 0 ">
+          and a.building_id in
+          <foreach collection="buildingIds" item="item" index="index" open="(" close=")" separator=",">
+              #{item}
+          </foreach>
+      </if>
+      <if test="buildingId != null and buildingId != '' ">
+          and a.building_id = #{buildingId}
+      </if>
+      <if test="userId != null and userId != ''">
+          and t.user_id != #{userId}
+      </if>
+    </select>
+
 </mapper>