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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.6</version>
+	<version>v3.5.8</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -587,4 +587,9 @@ public class CommConstant {
      */
     public static final String PANORAMA_TYPE_APARTMENT = "apartment";
 
+    /**
+     * 价格类型 均价
+     */
+    public static final String PRICE_TYPE_AVERAGE = "average";
+
 }

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

@@ -204,7 +204,7 @@ public class MiniAppController extends BaseController {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+            if(null!=from&&from.contains("share") && com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count>0){
                 // 校验是否点击过此人的分享
                 boolean checkPoint = checkSharePersonFrom(from,taPerson.getPersonId(),targetId,orgId);
                 if (checkPoint){

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

@@ -295,6 +295,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setBuildingProjectType(buildingProjectTypes);
         building.setPrice(null);
         buildingProjectTypes.forEach(e -> {
+            //兼容老小程序展示均价取其一
+            if (null == e.getPrice() && e.getPriceType().equals(CommConstant.PRICE_TYPE_AVERAGE)){
+                if (null != e.getStartPrice()){
+                    e.setPrice(e.getStartPrice());
+                }else if (null != e.getEndPrice()){
+                    e.setPrice(e.getEndPrice());
+                }
+            }
             if (e.getBuildingTypeId().equals(building.getBuildingTypeId())){
                 //价格相同显示一个否则显示区间
                 Integer startPrice = e.getStartPrice();

src/main/resources/application-green.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 8086
 spring:
   application:
     name: estateagents

src/main/resources/mapper/TaBuildingMapper.xml

@@ -139,8 +139,19 @@
                                     AND
                                 </if>
                                 <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
-                                    <![CDATA[ end_price <= ${priceArr[1]}  ]]>
+                                    <![CDATA[ start_price <= ${priceArr[1]}  ]]>
                                 </if>
+                            )  or
+                            (
+                            <if test='priceArr[0] != null and priceArr[0] != ""'>
+                                <![CDATA[ end_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[ end_price <= ${priceArr[1]}  ]]>
+                            </if>
                             )
                         </foreach>
                     </if>

src/main/resources/mapper/TaMiniappMapper.xml

@@ -9,6 +9,7 @@
         INNER JOIN ta_miniapp s ON t.org_id = s.org_id
         WHERE
             t.`status` = 1
+        and t.is_admin = 1
         AND t.exp_date >= now()
     </select>
 </mapper>