bugfix

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -234,9 +234,9 @@ public class Product extends DataEntity<Product> {
      * 新品商品状态  1.已审核  2.未参与   3.审核未通过
      */
     private Integer newvalidFlag;
-/**
- * 新品展示状态
- */
+    /**
+     * 新品展示状态
+     */
     private Integer showFlag;
     /**
      * 展示结束时间

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

@@ -396,21 +396,21 @@ public class ProductService extends CrudService<ProductDao, Product> {
 //        }
         if (null != product.getShopType() && 2 == product.getShopType()) {
             product.setValidFlag("2");
-            if(StringUtils.isNotBlank(product.getCostPrice())){
+            if (StringUtils.isNotBlank(product.getCostPrice())) {
                 product.setSqlCostPrice(Double.valueOf(product.getCostPrice()));
             }
-            if(StringUtils.isNotBlank(product.getTaxPoint())){
+            if (StringUtils.isNotBlank(product.getTaxPoint())) {
                 product.setSqlTaxPoint(Double.valueOf(product.getTaxPoint()));
             }
-            if(StringUtils.isNotBlank(product.getSupplierTaxPoint())){
+            if (StringUtils.isNotBlank(product.getSupplierTaxPoint())) {
                 product.setSqlSupplierTaxPoint(Double.valueOf(product.getSupplierTaxPoint()));
             }
-            if(StringUtils.isNotBlank(product.getCostProportional())){
+            if (StringUtils.isNotBlank(product.getCostProportional())) {
                 product.setSqlCostProportional(Double.valueOf(product.getCostProportional()));
             }
-            if(product.getNewProductType()==1){
+            if (product.getNewProductType() == 1) {
                 product.setShowFlag(1);
-            }else if(product.getNewProductType()==2){
+            } else if (product.getNewProductType() == 2) {
                 product.setShowFlag(3);
             }
 
@@ -428,12 +428,12 @@ public class ProductService extends CrudService<ProductDao, Product> {
             String image2 = product.getImage2();
             if (StringUtils.isNotEmpty(image2)) {
                 String imageUrl = getImageUrl(image2);
-                addProductImage(imageUrl, "0",  product.getProductID(), product.getShopID());
+                addProductImage(imageUrl, "0", product.getProductID(), product.getShopID());
             }
             String image3 = product.getImage3();
             if (StringUtils.isNotEmpty(image3)) {
                 String imageUrl = getImageUrl(image3);
-                addProductImage(imageUrl, "0",  product.getProductID(), product.getShopID());
+                addProductImage(imageUrl, "0", product.getProductID(), product.getShopID());
             }
             String image4 = product.getImage4();
             if (StringUtils.isNotEmpty(image4)) {
@@ -443,10 +443,10 @@ public class ProductService extends CrudService<ProductDao, Product> {
             String image5 = product.getImage5();
             if (StringUtils.isNotEmpty(image5)) {
                 String imageUrl = getImageUrl(image5);
-                addProductImage(imageUrl, "0",  product.getProductID(), product.getShopID());
+                addProductImage(imageUrl, "0", product.getProductID(), product.getShopID());
             }
             productDao.updateMainImage(product);
-        }else{
+        } else {
             productDao.updateByPrimaryKeySelective(product);
         }
         ProductDetailInfo queryProductDetailInfo = productDao.queryProductDetailInfo(product.getProductID());
@@ -564,25 +564,26 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public Page<Product> newfindProductImage(Page<Product> page, Product 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();
+        int num = 0;
+        if (null != productList && productList.size() > 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(num<0){
-              product.setShowFlag(2);
-                product.setRecommend(0);
-                product.setProductID(productList.get(i).getProductID());
-                newPageFloorDao.updatshowFlag(product);
+                num = productList.get(i).getShowTime().compareTo(dateString);
+                if (num < 0) {
+                    product.setShowFlag(2);
+                    product.setRecommend(0);
+                    product.setProductID(productList.get(i).getProductID());
+                    newPageFloorDao.updatshowFlag(product);
+                }
             }
         }
         page.setList(productList);
         return page;
-   }
-
-    public Product productList(Product product){
+    }
 
+    public Product productList(Product product) {
         return productDao.productList(product);
     }