bugfix

backup.sql

@@ -176,6 +176,8 @@ CREATE TABLE `cm_baike_product` (
     `alias` VARCHAR(50) NULL COMMENT '别名',
     `discription` VARCHAR(300) NULL COMMENT '描述',
     `image` TEXT NULL COMMENT '图片',
+    `authLink` TEXT NULL COMMENT '认证链接',
+    `authQrCode` TEXT NULL COMMENT '认证二维码',
     `advantage` VARCHAR(500) NULL COMMENT '优点',
     `disadvantage` VARCHAR(500) NULL COMMENT '缺点',
     `principle` VARCHAR(500) NULL COMMENT '原理',

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

@@ -129,7 +129,9 @@ public class EncyclopediaController extends BaseController {
      */
     @GetMapping("/more-{typeId}-{pageNum}-{pageSize}.html")
     public String getMoreList(final Model model, @PathVariable("typeId") Integer typeId, @PathVariable("pageNum") Integer pageNum, @PathVariable("pageSize") Integer pageSize) {
+        BaikeType baikeType = productService.getBaikeType(typeId);
         Map<String, Object> moreData = productService.getBaikeMoreJson(typeId, pageNum, pageSize);
+        model.addAttribute("typeName", baikeType.getName());
         model.addAttribute("moreData", moreData);
         return MORE_LIST;
     }

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

@@ -3,6 +3,7 @@ package com.caimei.www.mapper;
 import com.caimei.www.pojo.baike.BaikeProduct;
 import com.caimei.www.pojo.baike.BaikeProductParam;
 import com.caimei.www.pojo.baike.BaikeProductQuestion;
+import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.classify.Bigtype;
 import com.caimei.www.pojo.classify.SmallType;
 import com.caimei.www.pojo.order.CartItem;
@@ -41,4 +42,6 @@ public interface BaikeDao {
     List<BaikeProductQuestion> findQuestionList(Integer productId);
 
     void encyclopediaPv(Integer id);
+
+    BaikeType getBaikeType(Integer typeId);
 }

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

@@ -33,7 +33,14 @@ public class BaikeProduct implements Serializable {
      * 概述
      */
     private String discription;
-
+    /**
+     * 认证链接
+     */
+    private String authLink;
+    /**
+     * 认证二维码
+     */
+    private String authQrCode;
     /**
      * 别名
      */

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.baike.BaikeProduct;
+import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.ProductDetail;
 
 import java.util.Map;
@@ -85,4 +86,11 @@ public interface ProductService {
      * @return
      */
     Map<String, Object> getBaikeMoreJson(Integer typeId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 根据分类id获取百科分类
+     * @param typeId    分类id
+     * @return
+     */
+    BaikeType getBaikeType(Integer typeId);
 }

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

@@ -8,6 +8,7 @@ import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.baike.BaikeProduct;
 import com.caimei.www.pojo.baike.BaikeProductParam;
 import com.caimei.www.pojo.baike.BaikeProductQuestion;
+import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.ProductDetail;
 import com.caimei.www.service.page.ProductService;
 import com.caimei.www.utils.ImageUtil;
@@ -206,6 +207,11 @@ public class ProductServiceImpl implements ProductService {
         }
     }
 
+    @Override
+    public BaikeType getBaikeType(Integer typeId) {
+        return baikeDao.getBaikeType(typeId);
+    }
+
     @Override
     public BaikeProduct getBaikeProductDetail(Integer productId) {
         BaikeProduct baikeProduct = baikeDao.getBaikeProductDetail(productId);

src/main/resources/mapper/BaikeMapper.xml

@@ -11,6 +11,8 @@
 			   a.alias           AS "alias",
 			   a.discription     AS "discription",
 			   a.image           AS "image",
+		       a.authLink 		 AS "authLink",
+		       a.authQrCode      AS "authQrCode",
 			   a.advantage       AS "advantage",
 			   a.disadvantage    AS "disadvantage",
 			   a.principle       AS "principle",
@@ -46,4 +48,7 @@
 		from cm_baike_product_question
 		where productId = #{productId}
 	</select>
+	<select id="getBaikeType" resultType="com.caimei.www.pojo.baike.BaikeType">
+		select name from cm_baike_type where id = #{typeId}
+	</select>
 </mapper>