From 0a97c55ed0f597cb63e6e6d2772d1ce4c48c9231 Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Thu, 21 Jan 2021 20:37:19 +0800
Subject: [PATCH] 批量发货

---
 application/admin/controller/shopro/order/Order.php | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/application/admin/controller/shopro/order/Order.php b/application/admin/controller/shopro/order/Order.php
index fb42520..5d6454e 100644
--- a/application/admin/controller/shopro/order/Order.php
+++ b/application/admin/controller/shopro/order/Order.php
@@ -958,15 +958,11 @@ class Order extends Base
                         $orderExpress = null;
                         $need_subscribe = true;
                         if ($insert_order['express_no']) {
-                            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',$insert_order['express_code'])
                                 ->where('order_id',$insert_order['order_id'])
                                 ->find();
--
libgit2 0.24.0