分销商商品列表

app/Http/Controllers/Admin/GoodsController.php

@@ -653,7 +653,7 @@ class GoodsController extends Controller
      * @return \Illuminate\View\View
      */
     public function indexCopy(Request $request){
-        $offset = ($page-1) * $pageSize;
+
         //获取分类
         $cates = DB::table('categorys')->lists('name', 'id');
         //获取请求参数
@@ -665,7 +665,7 @@ class GoodsController extends Controller
             $page = 1;
         }
 
-        //若有请求参数，处理
+        //若有请求参数，初步查询处理
         $goodsIds = array();
         if($name || $cate_name){
             $goodsIds = Goods::where(function($query) use($name, $cate_name){
@@ -678,7 +678,7 @@ class GoodsController extends Controller
                 return view('goods/indexcopy', ['result' =>[],
                     'page'              =>$page,
                     'count'             =>0,
-                    'pages'             =>0,
+                    'pages'             =>1,
                     'name'              =>$name,
                     'cate_name'         =>$cate_name,
                     'cates'             =>$cates,
@@ -693,7 +693,7 @@ class GoodsController extends Controller
             }else if(count($goodsIds) == 1){
                 $query->where('goodsCode',$goodsIds);
             }
-        })->where('is_del',0)->count();
+        })->count();
 
         //分页数据处理
         if ($count > 1) {
@@ -705,19 +705,20 @@ class GoodsController extends Controller
         }
 
         //获取数据项
+        $offset = ($page-1) * $pageSize;
         $result = GoodsSkus::where(function($query) use ($goodsIds){
             if(count($goodsIds) > 1){
                 $query->whereIn('goodsCode',$goodsIds);
             } else if(count($goodsIds) == 1){
                 $query->where('goodsCode',$goodsIds);
             }
-        })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
+        })->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
 
         //对数据项进行处理
         foreach($result as $k=>&$v){
             # 获取goods信息
-            $goodsInfo = Goods::where('id', $v['goodsCode'])->where('is_del', 0)->first();
+            $goodsInfo = Goods::where('id', $v['goodsCode'])->first();
                 $quantity = GoodsSkus::actualQuantityByRedis($v['id']);
                 $v['real_quantity'] = $quantity['quantity'];
                 $v['pre_quantity'] = $quantity['w_num'];
@@ -767,13 +768,13 @@ class GoodsController extends Controller
             }else if(count($goodsIds) == 1){
                 $query->where('goodsCode',$goodsIds);
             }
-        })->where('is_del',0)->orderBy('id', 'desc')->get();
+        })->orderBy('id', 'desc')->get();
         $result = json_decode(json_encode($result),true);
 
         //对数据查询结果处理
         foreach($result as $k=>&$v){
             # 获取goods信息
-            $goodsInfo = Goods::where('id', $v['goodsCode'])->where('is_del', 0)->first();
+            $goodsInfo = Goods::where('id', $v['goodsCode'])->first();
             $quantity = GoodsSkus::actualQuantityByRedis($v['id']);
             $v['real_quantity'] = $quantity['quantity'];
             $v['pre_quantity'] = $quantity['w_num'];