Merge branch 'test01' of http://101.200.220.49:8001/sunhao/seafood into test01

app/Http/Controllers/Api/GoodsController.php

@@ -1,6 +1,7 @@
 <?php namespace App\Http\Controllers\Api;
 
 use App\Goods;
+use App\GoodsSkus;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
@@ -8,18 +9,27 @@ class GoodsController extends Controller {
 
 	public function index()
 	{
-        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white','goods.picUrl','goods.goodsCategoryName')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
+        $result = Goods::select('id as goods_id', 'name','picUrl','goodsCategoryName')->where('is_del', 0)->orderBy('goods.id', 'desc')->get();
         $result = json_decode(json_encode($result), true);
 
         $data = array();
         foreach($result as $value){
-            if($value['is_white'] == 0 && $value['quantity'] <= 0){
-                $value['stock'] = 0;
-            } else {
-                $value['stock'] = 1;
+            # 获取sku
+            $skuList = GoodsSkus::select('id as sku_id','propsName','price','is_white','quantity','is_weigh')->where('goodsCode', $value['goods_id'])->where('is_del', 0)->get();
+            $skuList = json_decode(json_encode($skuList),true);
+            $sku = array();
+            foreach($skuList as $v){
+                if($v['is_white'] == 0 && $v['quantity'] <= 0){
+                    $v['stock'] = 0;
+                } else {
+                    $v['stock'] = 1;
+                }
+                unset($v['is_white']);
+                unset($v['quantity']);
+                $sku[] = $v;
             }
-            unset($value['is_white']);
-            unset($value['quantity']);
+            $value['sku_list'] = $sku;
+
             if('0' == $value['goodsCategoryName']) {
                 $data['其它'][] = $value;
             } else {
@@ -33,17 +43,26 @@ class GoodsController extends Controller {
 	public function searchGoods(Request $request)
     {
         $name = trim($request->input('name'));
-        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white','goods.picUrl')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
+        $result = Goods::select('id as goods_id', 'name','picUrl','goodsCategoryName')->where('name', 'like', '%'.$name.'%')->where('is_del', 0)->orderBy('id', 'desc')->get();
         $result = json_decode(json_encode($result), true);
         $data = array();
-        foreach ($result as $value) {
-            if($value['is_white'] == 0 && $value['quantity'] <= 0){
-                $value['stock'] = 0;
-            } else {
-                $value['stock'] = 1;
+        foreach($result as $value){
+            # 获取sku
+            $skuList = GoodsSkus::select('id as sku_id','propsName','price','is_white','quantity','is_weigh')->where('goodsCode', $value['goods_id'])->where('is_del', 0)->get();
+            $skuList = json_decode(json_encode($skuList),true);
+            $sku = array();
+            foreach($skuList as $v){
+                if($v['is_white'] == 0 && $v['quantity'] <= 0){
+                    $v['stock'] = 0;
+                } else {
+                    $v['stock'] = 1;
+                }
+                unset($v['is_white']);
+                unset($v['quantity']);
+                $sku[] = $v;
             }
-            unset($value['is_white']);
-            unset($value['quantity']);
+            $value['sku_list'] = $sku;
+
             $data[] = $value;
         }