信息中心bugfix

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

@@ -64,7 +64,7 @@ public class ArticleController extends BaseController {
         List<CmBrandLandingVO> cmBrandLandingList = cmBrandLandingService.getCmBrandLandingList(new CmBrandLanding()
                 .setType("4").setAuthorId(id.toString()));
         List<Article> infoSelected = articleService.getArticleSelected(0, 5);
-        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(0, 3);
+        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers();
         List<BaseLink> data = articleService.getArticleLabels().getData();
         List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
@@ -92,7 +92,7 @@ public class ArticleController extends BaseController {
         List<BaseLink> typeList = articleService.getArticleTypes();
         List<BaseLink> data = articleService.getArticleLabels().getData();
         List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
-        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(0, 3);
+        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers();
         model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品
         model.addAttribute("archiveFiles", archiveFiles);//最新美业资料top3
@@ -115,7 +115,7 @@ public class ArticleController extends BaseController {
     public String selectedList(@PathVariable("id") Integer id, @PathVariable("pageNum") Integer pageNum, final Model model) {
         List<BaseLink> typeList = articleService.getArticleTypes();
         if (id == 1) {//精选文章
-            List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(0, 3);
+            List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
             List<ProductList> productSellNumbers = productService.getProductSellNumbers();
             model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品
             model.addAttribute("archiveFiles", archiveFiles);//最新美业资料top3
@@ -144,7 +144,7 @@ public class ArticleController extends BaseController {
             List<Article> infoSelected = articleService.getArticleSelected(null, null);
             pageData = new PaginationVo<Article>(infoSelected);
         } else {//美业资料
-            List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null, null);
+            List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,null, null);
             pageData = new PaginationVo<CmProductArchiveFile>(archiveFiles);
         }
         return JsonModel.success(pageData);
@@ -155,7 +155,7 @@ public class ArticleController extends BaseController {
         List<BaseLink> typeList = articleService.getArticleTypes();
         List<BaseLink> data = articleService.getArticleLabels().getData();
         List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
-        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(0, 3);
+        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers();
         model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品
         model.addAttribute("archiveFiles", archiveFiles);//最新美业资料top3
@@ -218,7 +218,8 @@ public class ArticleController extends BaseController {
         }
         String relatedLabels = articleService.relatedLabel(id);
         List<Article> infoSelected = articleService.getArticleSelected(0, 5);
-        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(0, 3);
+        Integer[] labelIds = article.getLabelIds();
+        List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(article.getLabelIds(), 0,3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers();
         model.addAttribute("infoSelected", infoSelected);//精选文章
         model.addAttribute("productSellNumbers", productSellNumbers);//销量前三商品

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

@@ -68,7 +68,9 @@ public interface ArticleDao {
      * @param
      * @return
      */
-    List<CmProductArchiveFile> findArchiveFileAddTime(@Param("pageNum") Integer pageNum,@Param("pageSize")  Integer pageSize);
+    List<CmProductArchiveFile> findArchiveFileAddTime(@Param("productIds") List<String> productIds,@Param("pageNum") Integer pageNum,@Param("pageSize")  Integer pageSize);
+
+    List<String> findArchiveFileProductID(@Param("labelIds")Integer[] labelIds);
 
     /**
      * 获取文章广告

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

@@ -46,7 +46,7 @@ public interface ArticleService {
      * @param
      * @return
      */
-    List<CmProductArchiveFile> findArchiveFileAddTime(Integer pageNum,   Integer pageSize);
+    List<CmProductArchiveFile> findArchiveFileAddTime(Integer[] labelIds,Integer pageNum,   Integer pageSize);
     /**
      * 获取相关文章
      */

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

@@ -121,8 +121,13 @@ public class ArticleServiceImpl implements ArticleService {
      *
      */
     @Override
-    public List<CmProductArchiveFile> findArchiveFileAddTime(Integer pageNum,   Integer pageSize) {
-        List<CmProductArchiveFile> selected = articleDao.findArchiveFileAddTime(pageNum,pageSize);
+    public List<CmProductArchiveFile> findArchiveFileAddTime(Integer[] labelIds,Integer pageNum,  Integer pageSize) {
+        List<String> archiveFileProductID=null;
+        if(null!=labelIds){
+            archiveFileProductID = articleDao.findArchiveFileProductID(labelIds);
+        }
+
+        List<CmProductArchiveFile> selected = articleDao.findArchiveFileAddTime(archiveFileProductID,pageNum,pageSize);
         return selected;
     }
 

src/main/resources/mapper/ArticleMapper.xml

@@ -98,11 +98,28 @@
 		left join cm_product_archive_content cc on cf.archiveContentId = cc.id
 		left join cm_product_archive  pa on cc.productArchiveId = pa.id
 		where cc.type = 3
+		<if test="productIds != null and productIds != ''">
+			pa.productId in
+			<foreach item="productID" collection="productIds" open="(" separator="," close=")">
+				#{productID}
+			</foreach>
+		</if>
 		order by cc.addTime desc
 		<if test="pageNum != null">
 			limit #{pageNum},#{pageSize}
 		</if>
 	</select>
+	<select id="findArchiveFileProductID" resultType="string">
+		SELECT p.productID from  product p
+		left join cm_organize_product_info copi on copi.productId = p.productId
+		where
+		<foreach collection="labelIds" item="label" open="(" close=")" index="index" separator="OR">
+			p.labelIds like CONCAT(CONCAT('%', #{label}), '%')
+		</foreach>
+		and copi.validFlag  = 2
+		and copi.organizeId=0
+
+	</select>
     <select id="getArticleRelated" resultType="com.caimei.www.pojo.page.Article">
         select
 			a.id as id,
@@ -189,6 +206,7 @@
 		  a.autoStatus AS autoStatus,
 		  a.recommendContent AS recommendContent,
 		  a.source AS source,
+		  a.labelIds,
 		  IFNULL((c.num + a.basePraise), 0) AS likes
 		FROM
 		  info AS a