6月小版本

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -566,17 +566,29 @@ public class ProductService extends CrudService<ProductDao, Product> {
         product.setPage(page);
         List<Product> productList = productDao.newfindProductImage(product);
         int num=0;
+
         for (int i=0;i<productList.size();i++){
             Date currentTime = new Date();
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String dateString = formatter.format(currentTime);
-            num=productList.get(i).getShowTime().compareTo(dateString);
+            /**
+             *如果有设置展示开始时间就当前时间判断，如果没有就用商品创建时间判断当前时间；
+             */
+                if(productList.get(i).getShowTime()!=null){
+                    num=productList.get(i).getShowTime().compareTo(dateString);
+                }else if(productList.get(i).getAddTime()!=null) {
+                    num=productList.get(i).getAddTime().compareTo(dateString);
+                }
             if(num<0){
               product.setShowFlag(2);
                 product.setRecommend(0);
                 product.setProductID(productList.get(i).getProductID());
                 newPageFloorDao.updatshowFlag(product);
+                //这里主要是解决页面上加载数据冲突问题没有调用get方法不会空指针异常？
+                product.setProductID(null);
+                product.setShowFlag(null);
             }
+
         }
         page.setList(productList);
         return page;

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -8,7 +8,7 @@
     <sql id="productColumns">
         a.newProductType,
         a.newvalidFlag,
-        a.announType,
+        ifnull(a.announType,1),
         a.productID AS "id",
         a.productID AS "productID",
         a.brandID AS "brandID",