Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/Api/OrderApiController.php

@@ -45,7 +45,26 @@ class OrderApiController extends Controller
 
 
 
 
     public function orderList(Request $request){
     public function orderList(Request $request){
-        return response()->json(["code"=>0,"msg"=>"ok","data"=>[],"count"=>0]);
+        $arr=[];
+        $arr[0]["goods_id"]="123456";
+        $arr[0]["goods_name"]="商品型号";
+        $arr[0]["standard_brand_name"]="标准品牌";
+        $arr[0]["supplier_name"]="应商";
+        $arr[0]["raw_goods_sn"]="供应商物料唯一编码";
+        $arr[0]["raw_brand_name"]="供应商物料品牌";
+        $arr[0]["purchase_name"]="采购员";
+        $arr[0]["currency_cn"]="美金";
+        $arr[0]["goods_price"]="0.12344";//单价
+        $arr[0]["goods_number"]="66";//购买数量
+        $arr[0]["total_amount"]="100";//小计
+        $arr[0]["discount_amount"]="0.2";//折扣金额
+        $arr[0]["other_amount"]="0.1";//其它费用
+        $arr[0]["delivery_time"]="1-200年";//货期
+        $arr[0]["batch"]="1-200年";//批次
+        $arr[0]["remarks"]="客户备注";//客户备注
+
+
+        return response()->json(["code"=>0,"msg"=>"ok","data"=>["list"=>$arr],"count"=>0]);
     }
     }
     
     
     
     

app/Admin/Service/OrderService.php

@@ -47,6 +47,8 @@ class OrderService
     }
     }
 
 
 
 
+    public static function orderIitemList($order_id=0){
+    }
 
 
 
 
 }
 }

app/Models/OrderItem.php

@@ -17,4 +17,12 @@ class OrderItem extends Model
 
 
     public $timestamps = false;
     public $timestamps = false;
 
 
+
+    public static function getOrderItems($order_id=0){
+        return self::where("order_id",$order_id)->get()->toArray();
+
+    }
+
+
+
 }
 }