bugfix-banner

src/main/java/com/caimei/www/controller/unlimited/EncyclopediaController.java

@@ -3,6 +3,7 @@ package com.caimei.www.controller.unlimited;
 import com.alibaba.fastjson.JSONArray;
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
+import com.caimei.www.pojo.baike.BaikeBanner;
 import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeProduct;
 import com.caimei.www.pojo.baike.BaikeType;
@@ -59,7 +60,7 @@ public class EncyclopediaController extends BaseController {
         List<BaikeHotSearch> searchHotWord = baseService.getBaikeSearchHotWord();
         model.addAttribute("searchHotWord", searchHotWord);
         // banner图
-        ImageLink banner = baseService.getBaikeBannerImage(commodityType);
+        BaikeBanner banner = baseService.getBaikeBannerImage(commodityType);
         model.addAttribute("banner", banner);
         // 分类列表
         List<BaikeType> typeList = baseService.getBaikeTypeList(commodityType);
@@ -98,7 +99,7 @@ public class EncyclopediaController extends BaseController {
         List<BaikeHotSearch> searchHotWord = baseService.getBaikeSearchHotWord();
         model.addAttribute("searchHotWord", searchHotWord);
         // banner图
-        ImageLink banner = baseService.getBaikeBannerImage(commodityType);
+        BaikeBanner banner = baseService.getBaikeBannerImage(commodityType);
         model.addAttribute("banner", banner);
         // 分类列表
         List<BaikeType> typeList = baseService.getBaikeTypeList(commodityType);

src/main/java/com/caimei/www/mapper/BaseDao.java

@@ -1,5 +1,6 @@
 package com.caimei.www.mapper;
 
+import com.caimei.www.pojo.baike.BaikeBanner;
 import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.*;
@@ -52,8 +53,9 @@ public interface BaseDao {
 
     /**
      * 采美百科banner图
+     * @return
      */
-    ImageLink getBaikeBannerImage(Integer commodityType);
+    BaikeBanner getBaikeBannerImage(Integer commodityType);
 
     /**
      * 采美百科分类列表

src/main/java/com/caimei/www/pojo/baike/BaikeBanner.java

@@ -0,0 +1,27 @@
+package com.caimei.www.pojo.baike;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Aslee
+ * @date : 2020/11/25
+ */
+@Data
+public class BaikeBanner implements Serializable {
+    /**
+     * pcBanner
+     */
+    private String pcBanner;
+    /**
+     * 小程序Banner
+     */
+    private String appBanner;
+    /**
+     * 链接
+     */
+    private String link;
+}

src/main/java/com/caimei/www/service/page/BaseService.java

@@ -1,10 +1,10 @@
 package com.caimei.www.service.page;
 
 import com.alibaba.fastjson.JSONObject;
+import com.caimei.www.pojo.baike.BaikeBanner;
 import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.BaseLink;
-import com.caimei.www.pojo.page.ImageLink;
 import com.caimei.www.pojo.page.TopMenu;
 
 import java.util.List;
@@ -49,8 +49,9 @@ public interface BaseService {
 
     /**
      * 采美百科banner图
+     * @return
      */
-    ImageLink getBaikeBannerImage(Integer commodityType);
+    BaikeBanner getBaikeBannerImage(Integer commodityType);
 
     /**
      * 采美百科分类列表

src/main/java/com/caimei/www/service/page/impl/BaseServiceImpl.java

@@ -3,6 +3,7 @@ package com.caimei.www.service.page.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.www.mapper.BaseDao;
+import com.caimei.www.pojo.baike.BaikeBanner;
 import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.*;
@@ -131,7 +132,7 @@ public class BaseServiceImpl implements BaseService {
     }
 
     @Override
-    public ImageLink getBaikeBannerImage(Integer commodityType) {
+    public BaikeBanner getBaikeBannerImage(Integer commodityType) {
         return baseDao.getBaikeBannerImage(commodityType);
     }
 

src/main/resources/mapper/BaseMapper.xml

@@ -56,9 +56,9 @@
     <select id="getBaikeSearchHotWord" resultType="com.caimei.www.pojo.baike.BaikeHotSearch">
         select keyWord,jumpType,productId,jumpLink from cm_baike_hot_search where status = 1 order by -sort desc,addTime desc
     </select>
-    <select id="getBaikeBannerImage" resultType="com.caimei.www.pojo.page.ImageLink">
-        select id,
-               if(#{commodityType} = 1, productPcBanner, instrumentPcBanner) as image,
+    <select id="getBaikeBannerImage" resultType="com.caimei.www.pojo.baike.BaikeBanner">
+        select if(#{commodityType} = 1, productPcBanner, instrumentPcBanner) as pcBanner,
+               if(#{commodityType} = 1, productAppBanner, instrumentAppBanner) as appBanner,
                if(#{commodityType} = 1, productLink, instrumentLink)         as link
         from cm_baike_banner
         where if(#{commodityType} = 1,productStatus,instrumentStatus) = 1