x

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

@@ -60,9 +60,8 @@ public class BrandController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
-    @RequestMapping(value="/{plat}/brand",method= RequestMethod.GET)
-    public ResponseBean brandList(@PathVariable String plat,
-                                  @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
+    public ResponseBean brandList(@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){
@@ -85,6 +84,18 @@ public class BrandController extends BaseController {
         return responseBean;
     }
 
+    /**
+     *
+     * @return
+     */
+    @ApiOperation(value = "wx-品牌开发商表列表", notes = "wx-品牌开发商表列表")
+    @RequestMapping(value="/wx/brand",method= RequestMethod.GET)
+    public ResponseBean wxBrandList(@RequestParam(value ="brandName",required = false) String brandName,
+                                  @RequestParam(value ="cityId",required = false) Integer cityId,
+                                  @RequestHeader("authorization") String token,HttpServletRequest request){
+        return iBrandService.getWxBrandList(cityId,brandName,getOrgId(request));
+    }
+
     /**
      * 保存对象
      * @param brandDTO 实体对象

src/main/java/com/yunzhi/marketing/xlk/mapper/BrandMapper.java

@@ -1,8 +1,10 @@
 package com.yunzhi.marketing.xlk.mapper;
 
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BrandMapper extends BaseMapper<Brand> {
 
+    /**
+     * 获取品牌开发商列表
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    ResponseBean getWxBrandList(Integer cityId, String brandName,Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IBrandService.java

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBrandService extends IService<Brand> {
 
+    /**
+     * 获取微信端的品牌开发商
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    ResponseBean getWxBrandList(Integer cityId, String brandName, Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/BrandServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.mapper.BrandMapper;
 import com.yunzhi.marketing.xlk.service.IBrandService;
@@ -17,4 +18,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements IBrandService {
 
+    /**
+     * 获取微信端的品牌开发商
+     *
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    @Override
+    public ResponseBean getWxBrandList(Integer cityId, String brandName,Integer orgId) {
+        return this.baseMapper.getWxBrandList(cityId, brandName,orgId);
+    }
 }

src/main/resources/mapper/xlk/BrandMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.BrandMapper">
 
+    <select id="getWxBrandList" resultType="com.yunzhi.marketing.base.ResponseBean">
+        SELECT
+            b.*
+        FROM
+            xlk_brand b
+            INNER JOIN (
+            SELECT
+                t.building_id,
+                t.brand_id
+            FROM
+                ta_building t
+            WHERE
+                t.org_id = #{orgId}
+            <if test="cityId != null and cityId != ''">
+                AND t.city_id = #{cityId}
+            </if>
+            GROUP BY
+                t.brand_id
+            ) c ON b.brand_id = c.brand_id
+        WHERE
+            b.ORG_ID = #{orgId}
+        <if test="brandName != null and brandName != ''">
+            and b.brand_name like CONCAT('%', #{brandName}, '%')
+        </if>
+    </select>
 </mapper>