feats

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -298,7 +298,8 @@ public class TaBuildingController extends BaseController {
             @RequestParam(required = false) String buildingArea,    // 区域
             @RequestParam(required = false) String brandId,    // 品牌开发商
             @RequestParam(required = false) Boolean isRecentOpening,    // 是否近期开盘
-            @RequestParam(required = false) String marketStatus,    // 是否近期开盘
+            @RequestParam(required = false) Boolean isCommerce,    // 是否文旅商办
+            @RequestParam(required = false) String marketStatus,    // 销售状态
             @RequestParam(required = false) String orderBy,    // 排序字段
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
@@ -338,6 +339,7 @@ public class TaBuildingController extends BaseController {
                 buildingArea,
                 brandId,
                 isRecentOpening,
+                isCommerce,
                 marketStatus,
                 orderBy);
     }

src/main/java/com/yunzhi/marketing/controller/TdCityController.java

@@ -107,6 +107,21 @@ public class TdCityController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 小程序端级联城市查询
+     * @param levelType
+     * @param parentCity
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/city/cascade")
+    public ResponseBean getCascadeCity(@RequestParam(value = "levelType") Integer levelType,
+                                       @RequestParam(value = "parentCity") Integer parentCity,
+                                       HttpServletRequest request) {
+        List<TdCity> cityList = iTdCityService.getCascadeCity(parentCity, levelType);
+        return ResponseBean.success(cityList);
+    }
+
     /**
      * 保存对象
      *

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -84,6 +84,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("buildingArea") String buildingArea,
                                          @Param("brandId") String brandId,
                                          @Param("isRecentOpening") Boolean isRecentOpening,
+                                         @Param("isCommerce") Boolean isCommerce,
                                          @Param("marketStatus") String marketStatus,
                                          @Param("orderBy") String orderBy);
 

src/main/java/com/yunzhi/marketing/mapper/TdCityMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Mapper
 public interface TdCityMapper extends BaseMapper<TdCity> {
-    List<TdCity> selectCity(@Param("leveltype")String leveltype,@Param("status") String status);
+    List<TdCity> selectCity(@Param("leveltype") String leveltype,@Param("status") String status);
 
     /**
      *查出当前ta_org_city下的城市
@@ -28,4 +28,6 @@ public interface TdCityMapper extends BaseMapper<TdCity> {
     List<TdCity> selectWxCity(@Param("orgId") Integer orgId);
 
     TdCity getOrgDefaultCity(@Param("orgId") Integer orgId);
+
+    List<TdCity> getCascadeCity(@Param("parentCity") Integer parentCity, @Param("levelType") Integer levelType);
 }

src/main/java/com/yunzhi/marketing/service/ITaBuildingService.java

@@ -135,6 +135,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String buildingArea,
             String brandId,
             Boolean isRecentOpening,
+            Boolean isCommerce,
             String marketStatus,
             String orderBy);
 

src/main/java/com/yunzhi/marketing/service/ITdCityService.java

@@ -27,4 +27,6 @@ public interface ITdCityService extends IService<TdCity> {
      * @return
      */
     TdCity getLocationCity(String location, Integer orgId, String personId);
+
+    List<TdCity> getCascadeCity(Integer parentCity, Integer levelType);
 }

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

@@ -422,8 +422,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         LambdaQueryWrapper<BuildingSpecialRoom> specialRoomLambdaQueryWrapper = new LambdaQueryWrapper<>();
         specialRoomLambdaQueryWrapper.eq(BuildingSpecialRoom::getBuildingId, building.getBuildingId());
         LocalDateTime now = LocalDateTime.now();
-        specialRoomLambdaQueryWrapper.ge(BuildingSpecialRoom::getStartTime,now);
-        specialRoomLambdaQueryWrapper.le(BuildingSpecialRoom::getEndTime,now);
+        specialRoomLambdaQueryWrapper.le(BuildingSpecialRoom::getStartTime,now);
+        specialRoomLambdaQueryWrapper.ge(BuildingSpecialRoom::getEndTime,now);
         specialRoomLambdaQueryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
         return buildingSpecialRoomMapper.selectList(specialRoomLambdaQueryWrapper);
     }
@@ -866,6 +866,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String buildingArea,
             String brandId,
             Boolean isRecentOpening,
+            Boolean isCommerce,
             String marketStatus,
             String orderBy) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
@@ -919,6 +920,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 buildingArea,
                 brandId,
                 isRecentOpening,
+                isCommerce,
                 marketStatus,
                 orderBy);
 
@@ -1280,7 +1282,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             getBuildingAttaches(building);
 
             // 查询特价房
-            building.setSpecialRoomList(getSpecialBy(building));
+            List<BuildingSpecialRoom> specialRoomList = getSpecialBy(building);
+            building.setSpecialRoomList(specialRoomList);
         }
 
         return result;

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

@@ -119,4 +119,9 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
         return tdCityMapper.getOrgDefaultCity(orgId);
     }
 
+    @Override
+    public List<TdCity> getCascadeCity(Integer parentCity, Integer levelType) {
+        return tdCityMapper.getCascadeCity(parentCity, levelType);
+    }
+
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -117,6 +117,9 @@
                 <if test="brandId != null">
                     AND brand_id = #{brandId}
                 </if>
+                <if test="isCommerce != null and isCommerce">
+                    AND is_commerce = 1
+                </if>
                 <if test="isRecentOpening != null and isRecentOpening">
                     AND is_recent_opening = 1
                 </if>
@@ -789,7 +792,8 @@
             AND s.start_time &lt;= now( )
             AND s.end_time &gt;= now( )
         WHERE
-            t.org_id = 1
+            t.org_id = #{orgId}
+            AND t.city_id = #{cityId}
             AND t.`status` = 1
         ORDER BY
             t.create_date DESC

src/main/resources/mapper/TdCityMapper.xml

@@ -56,5 +56,16 @@ ORDER BY
         WHERE
             s.org_id = #{orgId}
     </select>
+    <select id="getCascadeCity" resultType="com.yunzhi.marketing.entity.TdCity">
+        SELECT
+            *
+        FROM
+            td_city t
+        WHERE
+            t.parentid = #{parentCity}
+          AND t.leveltype = #{levelType}
+        ORDER BY
+            t.id
+    </select>
 
 </mapper>