二手品牌列表

src/main/java/com/caimei365/commodity/controller/ProductPageApi.java

@@ -81,15 +81,6 @@ public class ProductPageApi {
         return pageService.getHomeData(userId, source);
     }
 
-    /**
-     * 商品品牌列表
-     */
-    @ApiOperation("商品品牌列表(旧：/product/brandList)")
-    @GetMapping("brands")
-    public ResponseJson<List<BrandVo>> getBrandList() {
-        return pageService.getBrandList();
-    }
-
     /**
      * 商品详情页
      *

src/main/java/com/caimei365/commodity/controller/SecondHandApi.java

@@ -3,6 +3,7 @@ package com.caimei365.commodity.controller;
 import com.caimei365.commodity.idempotent.Idempotent;
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.dto.SecondDto;
+import com.caimei365.commodity.model.vo.BrandVo;
 import com.caimei365.commodity.model.vo.PaginationVo;
 import com.caimei365.commodity.model.vo.SecondDetailVo;
 import com.caimei365.commodity.model.vo.SecondListVo;
@@ -16,6 +17,8 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Description
  *
@@ -117,4 +120,13 @@ public class SecondHandApi {
         return secondHandService.getOrderPageSecondList(searchKeyword, secondHandType, instrumentType, pageNum, pageSize);
     }
 
+    /**
+     * 二手发布页-品牌列表
+     */
+    @ApiOperation("二手发布页-品牌列表(旧：/product/brandList)")
+    @GetMapping("brands")
+    public ResponseJson<List<BrandVo>> getBrandList() {
+        return secondHandService.getBrandList();
+    }
+
 }

src/main/java/com/caimei365/commodity/mapper/PageMapper.java

@@ -70,10 +70,6 @@ public interface PageMapper {
      * @param source
      */
     List<ShopImageVo> getSupplierImage(Integer source);
-    /**
-     * 商品品牌列表
-     */
-    List<BrandVo> getBrandList();
     /**
      * 商品详情页
      */

src/main/java/com/caimei365/commodity/mapper/SecondHandMapper.java

@@ -4,6 +4,7 @@ import com.caimei365.commodity.model.po.ProductImagePo;
 import com.caimei365.commodity.model.po.ProductPo;
 import com.caimei365.commodity.model.po.ProductSecondPo;
 import com.caimei365.commodity.model.vo.AddressVo;
+import com.caimei365.commodity.model.vo.BrandVo;
 import com.caimei365.commodity.model.vo.SecondDetailVo;
 import com.caimei365.commodity.model.vo.SecondListVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -66,4 +67,8 @@ public interface SecondHandMapper {
      * @param secondHandType 二手商品分类，1二手仪器，2临期产品，3其他
      */
     List<SecondListVo> getSecondListByLimit(Integer secondHandType);
+    /**
+     * 商品品牌列表
+     */
+    List<BrandVo> getBrandList();
 }

src/main/java/com/caimei365/commodity/service/PageService.java

@@ -40,11 +40,6 @@ public interface PageService {
      */
     ResponseJson<Map<String, Object>> getHomeData(Integer userId, Integer source);
 
-    /**
-     * 商品品牌列表
-     */
-    ResponseJson<List<BrandVo>> getBrandList();
-
     /**
      * 商品详情页
      *

src/main/java/com/caimei365/commodity/service/SecondHandService.java

@@ -2,11 +2,14 @@ package com.caimei365.commodity.service;
 
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.dto.SecondDto;
+import com.caimei365.commodity.model.vo.BrandVo;
 import com.caimei365.commodity.model.vo.PaginationVo;
 import com.caimei365.commodity.model.vo.SecondDetailVo;
 import com.caimei365.commodity.model.vo.SecondListVo;
 import org.springframework.http.HttpHeaders;
 
+import java.util.List;
+
 /**
  * Description
  *
@@ -72,4 +75,9 @@ public interface SecondHandService {
      * @param instrumentType 二手仪器分类的类型，1轻光电、2重光电、3耗材配件
      */
     ResponseJson<PaginationVo<SecondListVo>> getOrderPageSecondList(String searchKeyword, Integer secondHandType, Integer instrumentType, int pageNum, int pageSize);
+
+    /**
+     * 商品品牌列表
+     */
+    ResponseJson<List<BrandVo>> getBrandList();
 }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -158,19 +158,6 @@ public class PageServiceImpl implements PageService {
         return ResponseJson.success(map);
     }
 
-    /**
-     * 商品品牌列表
-     */
-    @Override
-    public ResponseJson<List<BrandVo>> getBrandList() {
-        List<BrandVo> brandList = pageMapper.getBrandList();
-        BrandVo other = new BrandVo();
-        other.setId(161);
-        other.setName("其他");
-        brandList.add(other);
-        return ResponseJson.success(brandList);
-    }
-
     /**
      * 商品详情页
      *

src/main/java/com/caimei365/commodity/service/impl/SecondHandServiceImpl.java

@@ -7,10 +7,7 @@ import com.caimei365.commodity.model.dto.SecondDto;
 import com.caimei365.commodity.model.po.ProductImagePo;
 import com.caimei365.commodity.model.po.ProductPo;
 import com.caimei365.commodity.model.po.ProductSecondPo;
-import com.caimei365.commodity.model.vo.AddressVo;
-import com.caimei365.commodity.model.vo.PaginationVo;
-import com.caimei365.commodity.model.vo.SecondDetailVo;
-import com.caimei365.commodity.model.vo.SecondListVo;
+import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.SecondHandService;
 import com.caimei365.commodity.utils.ImageUtils;
 import com.github.pagehelper.PageHelper;
@@ -296,6 +293,19 @@ public class SecondHandServiceImpl implements SecondHandService {
         return ResponseJson.success(pageData);
     }
 
+    /**
+     * 商品品牌列表
+     */
+    @Override
+    public ResponseJson<List<BrandVo>> getBrandList() {
+        List<BrandVo> brandList = secondHandMapper.getBrandList();
+        BrandVo other = new BrandVo();
+        other.setId(161);
+        other.setName("其他");
+        brandList.add(other);
+        return ResponseJson.success(brandList);
+    }
+
     private ResponseJson saveSecondHandProduct(SecondDto secondDto) {
         // 设置日期时间格式
         Date date = new Date();

src/main/resources/mapper/PageMapper.xml

@@ -137,12 +137,6 @@
         </if>
         order by - sort desc,createDate desc
     </select>
-    <select id="getBrandList" resultType="com.caimei365.commodity.model.vo.BrandVo">
-        select id, name
-        from cm_brand
-		where status = '1' and delFlag = '0' and description is not null and description != '' and id not in (161)
-		order by sort
-    </select>
     <select id="getProductDetails" resultType="com.caimei365.commodity.model.vo.ProductDetailVo">
         select productID as productId, shopID as shopId,  name, aliasName, commodityType, mainImage, stock, invoiceType,
             bigTypeID as bigTypeId, smallTypeID as smallTypeId, tinyTypeID as tinyTypeId, searchKey, visibility,

src/main/resources/mapper/SecondHandMapper.xml

@@ -164,4 +164,10 @@
         order by cshd.onLineDate desc
         limit 10
     </select>
+    <select id="getBrandList" resultType="com.caimei365.commodity.model.vo.BrandVo">
+        select id, name
+        from cm_brand
+		where status = '1' and delFlag = '0' and description is not null and description != '' and id not in (161)
+		order by sort
+    </select>
 </mapper>