批量发货

@@ -141,6 +141,7 @@ class Order extends Base
             'refund_fee' => '退款金额',
             'refund_msg' => '退款原因',
             'express_name' => '快递公司',
+            'express_code' => '快递编码',
             'express_no' => '快递单号',
         ];
 
@@ -897,6 +898,7 @@ class Order extends Base
             '退款金额' => 'refund_fee',
             '退款原因' => 'refund_msg',
             '快递公司' => 'express_name',
+            '快递编码' => 'express_code',
             '快递单号' => 'express_no',
         ];
 
@@ -955,24 +957,26 @@ class Order extends Base
                         $orderExpress = null;
                         $need_subscribe = true;
                         if ($insert_order['express_no']) {
-                            $express = \app\admin\model\shopro\Express::where('name',$insert_order['express_name'])->find();
-                            if(!$express){
-                                $this->error('Id为'.$insert_order['order_id'].'的快递公司不存在');
+                            if(!$insert_order['express_name']){
+                                $this->error('请填写Id为'.$insert_order['order_id'].'的快递公司');
+                            }
+                            if(!$insert_order['express_code']){
+                                $this->error('请填写Id为'.$insert_order['order_id'].'的快递编码');
                             }
                             // 修改包裹
                             $orderExpress = OrderExpress::where('express_no', $insert_order['express_no'])
                                 ->where('express_name',$insert_order['express_name'])
-                                ->where('express_code',$express['code'])
+                                ->where('express_code',$insert_order['express_code'])
                                 ->where('order_id',$insert_order['order_id'])
                                 ->find();
                             if ($orderExpress) {
                                 // 没有编辑快递信息，不需要重新订阅快递
                                 $need_subscribe = false;
                             }
-                            $orderExpress = Db::transaction(function () use ($insert_order, $order, $item, $orderExpress, $express) {
+                            $orderExpress = Db::transaction(function () use ($insert_order, $order, $item, $orderExpress) {
                                 $order->sendItem($order, $item, [
                                     "express_name" => $insert_order['express_name'],
-                                    "express_code" => $express['code'],
+                                    "express_code" => $insert_order['express_code'],
                                     "express_no" => $insert_order['express_no'],
                                     "oper" => $this->auth->getUserInfo(),
                                     "oper_type" => 'admin',
@@ -984,7 +988,7 @@ class Order extends Base
                                     $orderExpress->order_id = $order->id;
                                 }
                                 $orderExpress->express_name = $insert_order['express_name'];
-                                $orderExpress->express_code = $express['code'];
+                                $orderExpress->express_code = $insert_order['express_code'];
                                 $orderExpress->express_no = $insert_order['express_no'];
                                 $orderExpress->save();
 
@@ -1004,7 +1008,7 @@ class Order extends Base
                                 try {
                                     $expressLib = new \addons\shopro\library\Express();
                                     $expressLib->subscribe([
-                                        'express_code' => $express['code'],
+                                        'express_code' => $insert_order['express_code'],
                                         'express_no' => $insert_order['express_no']
                                     ], $orderExpress, $order);
                                 } catch (\Exception $e) {