Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/report/controller/Stats.php

@@ -395,8 +395,8 @@ class Stats extends Base
       ->group('good_name,companyName,spuCode')
       ->paginate(['list_rows'=>$param['size'], 'page'=>$param['page']]);
 	    foreach ($list->items() as &$value){
-	        $value['stock_num'] = (new GoodStock())->where('spuCode',$value['good_code'])->sum('usable_stock');
-			$value['good_price'] = (new PurcheaseOrder())->where(['spuCode'=>$value['good_code'],'order_source'=>0])->value('good_price',0);
+	        $value['stock_num'] = (new GoodStock())->where('spuCode',$value['spuCode'])->sum('usable_stock');
+			$value['good_price'] = (new PurcheaseOrder())->where(['spuCode'=>$value['spuCode'],'order_source'=>0])->value('good_price',0);
 			$value['total_fee'] = bcmul(strval($value['good_price']),strval($value['good_num']),2);
 	      }
        $this->success('获取成功',['result'=>$list->items(),'count'=>$list->total()]);