一些功能

app/models/store/StoreProduct.php

@@ -194,7 +194,8 @@ class StoreProduct extends BaseModel
             foreach ($list as $k => $v) {
                 if ($store_id) {
                     $stockinfo = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->find();
-                    $list[$k]['price'] = $stockinfo ? SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->min('price') : $v['price'];
+                    $min = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->where('price', '>', 0)->min('price');
+                    $list[$k]['price'] = ($stockinfo && $min > 0) ? $min : $v['price'];
                 }
                 $list[$k]['activity'] = self::activity($v['id']);
             }
@@ -220,7 +221,8 @@ class StoreProduct extends BaseModel
             foreach ($list as $k => $v) {
                 if ($store_id) {
                     $stockinfo = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->find();
-                    $list[$k]['price'] = $stockinfo ? SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->min('price') : $v['price'];
+                    $min = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->where('price', '>', 0)->min('price');
+                    $list[$k]['price'] = ($stockinfo && $min > 0) ? $min : $v['price'];
                 }
                 $list[$k]['activity'] = self::activity($v['id']);
             }
@@ -268,11 +270,10 @@ class StoreProduct extends BaseModel
         if (!empty($list)) {
             foreach ($list as $k => $v) {
                 $list[$k]['activity'] = self::activity($v['id']);
-//                var_dump($store_id);
                 if ($store_id) {
                     $stockinfo = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->find();
-//                    var_dump($stockinfo);
-                    $list[$k]['price'] = $stockinfo ? SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->min('price') : $v['price'];
+                    $min = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->where('price', '>', 0)->min('price');
+                    $list[$k]['price'] = ($stockinfo && $min > 0) ? $min : $v['price'];
                 }
             }
         }
@@ -337,7 +338,8 @@ class StoreProduct extends BaseModel
             foreach ($data as $k => $v) {
                 if ($store_id) {
                     $stockinfo = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->find();
-                    $data[$k]['price'] = $stockinfo ? SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->min('price') : $v['price'];
+                    $min = SystemStoreProductStock::where('product_id', $v['id'])->where('store_id', $store_id)->where('price', '>', 0)->min('price');
+                    $data[$k]['price'] = ($stockinfo && $min > 0) ? $min : $v['price'];
                 }
                 $data[$k]['activity'] = self::activity($v['id']);
             }