feats

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

@@ -266,8 +266,21 @@ public class TaBuildingController extends BaseController {
     }
 
     /**
-     * 微信楼盘列表
-     *
+     * 微信端楼盘列表
+     * @param pageNumber
+     * @param pageSize
+     * @param mine
+     * @param cityId
+     * @param name
+     * @param buildingType
+     * @param houseType
+     * @param price
+     * @param priceType
+     * @param area
+     * @param buildingArea
+     * @param brandId
+     * @param orderBy 排序字段, 暂时支持类型  单价 : price-asc, price-desc, 开盘时间 : openingDate-asc, openingDate-desc
+     * @param request
      * @return
      */
     @RequestMapping(value = "/wx/building/list", method = RequestMethod.GET)
@@ -282,6 +295,10 @@ public class TaBuildingController extends BaseController {
             @RequestParam(required = false) String price,   // 价格
             @RequestParam(required = false) String priceType,   // 价格类型
             @RequestParam(required = false) String area,    // 面积
+            @RequestParam(required = false) String buildingArea,    // 区域
+            @RequestParam(required = false) String brandId,    // 品牌开发商
+            @RequestParam(required = false) Boolean isRecentOpening,    // 是否近期开盘
+            @RequestParam(required = false) String orderBy,    // 排序字段
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
 //            @RequestParam(required = false) Double minBuildingArea, // 最小面积
@@ -305,7 +322,22 @@ 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, priceType);
+        return taBuildingService.getWxBuildingList(pageNumber,
+                pageSize,
+                name,
+                targets,
+                cityId,
+                mine,
+                houseTypeList,
+                buildingTypeList,
+                priceList,
+                areaList,
+                orgId,
+                priceType,
+                buildingArea,
+                brandId,
+                isRecentOpening,
+                orderBy);
     }
 
 

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

@@ -80,7 +80,11 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("priceList") List<String[]> priceList,
                                          @Param("areaList") List<String[]> areaList,
                                          @Param("orgId")Integer orgId,
-                                         @Param("priceType") String priceType);
+                                         @Param("priceType") String priceType,
+                                         @Param("buildingArea") String buildingArea,
+                                         @Param("brandId") String brandId,
+                                         @Param("isRecentOpening") Boolean isRecentOpening,
+                                         @Param("orderBy") String orderBy);
 
     /**
      * 根据项目类型Id 查询

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

@@ -117,18 +117,24 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageNum
      * @param pageSize
      * @param name
+     * @param type
      */
     ResponseBean getWxBuildingList(
             Integer pageNum,
             Integer pageSize,
             String name,
             List<String> targets,
-            Integer cityId,boolean mine,
+            Integer cityId, boolean mine,
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId,String priceType);
+            Integer orgId,
+            String priceType,
+            String buildingArea,
+            String brandId,
+            Boolean isRecentOpening,
+            String orderBy);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -858,13 +858,39 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId, String priceType) {
+            Integer orgId,
+            String priceType,
+            String buildingArea,
+            String brandId,
+            Boolean isRecentOpening,
+            String orderBy) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         if (CollectionUtils.isEmpty(targets) && mine) {
             return ResponseBean.success(page);
         }
 
+        if (orderBy == null) {
+            orderBy = "";
+        }
+        switch (orderBy) {
+            case "price-asc":
+                orderBy = "tbpt.start_price ASC";
+                break;
+            case "desc-asc":
+                orderBy = "tbpt.end_price DESC";
+                break;
+            case "openingDate-asc":
+                orderBy = "tb.opening_date ASC";
+                break;
+            case "openingDate-desc":
+                orderBy = "tb.opening_date DESC";
+                break;
+            default:
+                orderBy = "tb.order_no DESC";
+                break;
+        }
+
 //        QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
 //        buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
 //        buildingQueryWrapper.eq("status", 1);
@@ -876,7 +902,20 @@ 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, priceType);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page,
+                name,
+                cityId,
+                targets,
+                houseTypeList,
+                buildingTypeList,
+                priceList,
+                areaList,
+                orgId,
+                priceType,
+                buildingArea,
+                brandId,
+                isRecentOpening,
+                orderBy);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {

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

@@ -60,8 +60,9 @@ public class BrandController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
-    @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
-    public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    @RequestMapping(value="/{plat}/brand",method= RequestMethod.GET)
+    public ResponseBean brandList(@PathVariable String plat,
+                                  @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                   @RequestParam(value ="brandName",required = false) String brandName,
                                   @RequestHeader("authorization") String token,HttpServletRequest request){
@@ -184,8 +185,10 @@ public class BrandController extends BaseController {
      * @param id  实体ID
      */
     @ApiOperation(value = "admin-获取品牌开发商表详情数据", notes = "admin-获取品牌开发商表详情数据")
-    @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.GET)
-    public ResponseBean brandGet(@PathVariable String id, @RequestHeader("authorization") String token){
+    @RequestMapping(value="/{plat}/brand/{id}",method= RequestMethod.GET)
+    public ResponseBean brandGet(@PathVariable String plat,
+                                 @PathVariable String id,
+                                 @RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iBrandService.getById(id));

src/main/java/com/yunzhi/marketing/xlk/dto/BrandDTO.java

@@ -33,6 +33,11 @@ public class BrandDTO implements Serializable {
      */
     private String brandName;
 
+    /**
+     * 品牌商logo
+     */
+    private String brandLogo;
+
     /**
      * 品牌商宣传图
      */

src/main/java/com/yunzhi/marketing/xlk/entity/Brand.java

@@ -48,6 +48,11 @@ public class Brand implements Serializable {
      */
     private String brandImg;
 
+    /**
+     * 品牌商logo
+     */
+    private String brandLogo;
+
     /**
      * 品牌商简介
      */

src/main/resources/mapper/TaBuildingMapper.xml

@@ -111,6 +111,15 @@
                 <if test="cityId != null">
                     AND city_id = #{cityId}
                 </if>
+                <if test="buildingArea != null">
+                    AND building_area = #{buildingArea}
+                </if>
+                <if test="brandId != null">
+                    AND brand_id = #{brandId}
+                </if>
+                <if test="isRecentOpening != null and isRecentOpening">
+                    AND is_recent_opening = 1
+                </if>
                 <if test="targets != null and targets.size > 0">
                     AND building_id IN
                     <foreach collection="targets" item="buildingId" open="(" close=")" separator=",">
@@ -204,7 +213,7 @@
                 ) as tba ON tb.building_id = tba.building_id
             </if>
             WHERE tb.org_id = #{orgId}
-            ORDER BY tb.order_no DESC
+            ORDER BY ${orderBy}
     </select>
 
     <select id="selectBuildingByBuildingTypeId" resultType="com.yunzhi.marketing.entity.TaBuilding">