Merge branch 'dev_fast_delivery' into test6.9.12

@@ -2017,7 +2017,7 @@ public class ProductServiceImpl implements ProductService {
             Map<String, List<GoodsBO>> tabs = new HashMap<>();
             Map<String, List<GoodsBO>> tabs = new HashMap<>();
             tabs.put("goods_list", Arrays.asList(goodsBO));
             tabs.put("goods_list", Arrays.asList(goodsBO));
             tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO));
             tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO));
-            tabs.put("seconds_goods_list", Arrays.asList(goodsBO));
+            tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO));
             product_info.setGoodsListTabs(tabs);
             product_info.setGoodsListTabs(tabs);
             product_info.setGoodsList(null);
             product_info.setGoodsList(null);
         }
         }
@@ -2124,9 +2124,9 @@ public class ProductServiceImpl implements ProductService {
         }
         }
         return sp2;
         return sp2;
     }
     }
-    private boolean notAllNull(Object... obj) {
-        for (Object o : obj) {
-            if (o != null) {
+    private boolean notAllNull(Integer... numbers) {
+        for (Integer n : numbers) {
+            if (n != null && n > 0) {
                 return true;
                 return true;
             }
             }
         }
         }