Merge remote-tracking branch 'origin/master'

application/admin/service/OrderItemDao.php

@@ -11,7 +11,6 @@ namespace app\admin\service;
 
 use app\admin\command\Util;
 use app\admin\model\CfItem;
-use app\admin\model\OrderHotel;
 use app\admin\model\OrderItem;
 use app\admin\model\Purchase;
 use think\Exception;
@@ -55,12 +54,12 @@ class OrderItemDao
                 "trade_order_number" => $param['trade_order_number'],
                 "del_flag"=>0
             ];
-            $orderHotelModel = new OrderHotel();
+            $model = new OrderItem();
             if (empty($param['id'])) {
-                $id = $orderHotelModel->insertGetId($data);
+                $id = $model->insertGetId($data);
                 return Util::returnArrSu("",$id);
             }else {
-                $orderHotelModel->save($data,["id"=>$param['id']]);
+                $model->save($data,["id"=>$param['id']]);
                 return Util::returnArrSu("",$param['id']);
             }
         }catch (Exception $e){

application/admin/service/PurchaseDao.php

@@ -111,7 +111,7 @@ class PurchaseDao
                 return Util::returnArrSu("", $param['purchase_id']);
             }
         }catch (Exception $e){
-            return Util::returnArrEr("新增采购都失败:".$e->getMessage());
+            return Util::returnArrEr("新增采购单失败:".$e->getMessage());
         }
     }