Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei365/manager/service/caimei/impl/HomeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.caimei365.manager.service.caimei.impl;
 
+import com.caimei.utils.AppUtils;
 import com.caimei365.manager.config.utils.DateUtil;
 import com.caimei365.manager.dao.HomeDao;
 import com.caimei365.manager.entity.ResponseJson;
@@ -149,6 +150,9 @@ public class HomeServiceImpl implements HomeService {
         List<Map<String, String>> mapBrandProductSalesRecord = homeDao.countBrandProductSalesRecord(startCreateTime, endCreateTime);
         // 热门商品
         List<Map<String, String>> mapProductSalesRecord = homeDao.countProductSalesRecord(startCreateTime, endCreateTime);
+        mapProductSalesRecord.forEach(s->{
+            s.put("image",AppUtils.getImageURL("product",s.get("image"), 0, "https://www.caimei365.com/"));
+        });
         // 热门搜索词
         List<String> mapKeyword = homeDao.countKeyword(startCreateTime, endCreateTime);
 

src/main/resources/mapper/HomeDao.xml

@@ -133,7 +133,7 @@
         FROM cm_product_sales_record cpsr
         LEFT JOIN product p ON p.productID = cpsr.productID
         LEFT JOIN cm_brand  cb ON cb.id = p.brandID
-        WHERE 1=1
+        WHERE 1=1 and cb.name is not null
         <if test="startCreateTime != null ">AND cpsr.saleTime >= #{startCreateTime}</if>
         <if test="endCreateTime != null ">AND cpsr.saleTime <![CDATA[ <= ]]> #{endCreateTime}</if>
         group by p.brandID