修改订单发货管理

app/data/controller/ShopOrder.php

@@ -42,16 +42,17 @@ class ShopOrder extends Controller
         $query->equal('status,payment_type,payment_status');
         $query->dateBetween('create_at,payment_datetime,cancel_datetime,truck_datetime,truck_send_datetime');
         $query->like('order_no,truck_name,truck_phone,truck_province|truck_area|truck_address#address,truck_send_no,truck_send_name');
+        // 发货信息搜索
+        $db = $this->_query('ShopOrderSend')->like('address_name#truck_address_name,address_phone#truck_address_phone,address_province|address_city|address_area|address_content#truck_address_content')->db();
+        if ($db->getOptions('where')) $query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
         // 会员搜索查询
         $db = $this->_query('DataMember')->like('phone#member_phone,nickname#member_nickname')->db();
-        if ($db->getOptions('where')) $query->whereRaw("mid in {$db->fieldRaw('id')->buildSql()}");
+        if ($db->getOptions('where')) $query->whereRaw("mid in {$db->field('id')->buildSql()}");
         // 推荐人搜索查询
         $db = $this->_query('DataMember')->like('phone#from_phone,nickname#from_nickname')->db();
-        if ($db->getOptions('where')) $query->whereRaw("from in {$db->fieldRaw('id')->buildSql()}");
+        if ($db->getOptions('where')) $query->whereRaw("from in {$db->field('id')->buildSql()}");
         // 列表选项卡
-        if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) {
-            $query->where(['status' => $this->type]);
-        }
+        if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) $query->where(['status' => $this->type]);
         // 分页排序处理
         if (input('output') === 'json') {
             $result = $query->order('id desc')->page(true, false);
@@ -87,7 +88,7 @@ class ShopOrder extends Controller
             $query = $this->app->db->name('ShopTruckCompany')->where($map);
             $this->items = $query->order('sort desc,id desc')->select()->toArray();
         }
-        $this->_form($this->table, '', 'order_no');
+        $this->_form('ShopOrderSend', '', 'order_no');
     }
 
     /**
@@ -101,15 +102,20 @@ class ShopOrder extends Controller
     {
         if ($this->request->isPost()) {
             $map = ['order_no' => $vo['order_no']];
-            $order = $this->app->db->name($this->table)->where($map)->find();
+            $order = $this->app->db->name('ShopOrder')->where($map)->find();
             if (empty($order)) $this->error('订单查询异常，请稍候再试！');
             // 配送快递公司信息填写
-            $map = ['code_1|code_2|code_3' => $vo['truck_send_code']];
+            $map = ['code_1|code_2|code_3' => $vo['company_code']];
             $company = $this->app->db->name('ShopTruckCompany')->where($map)->find();
             if (empty($company)) $this->error('配送快递公司异常，请重新选择快递公司！');
-            $vo['status'] = 4;
-            $vo['truck_send_name'] = $company['name'];
-            $vo['truck_send_datetime'] = $order['truck_send_datetime'] ?: date('Y-m-d H:i:s');
+            $vo['status'] = 2;
+            $vo['company_name'] = $company['name'];
+            $vo['send_datetime'] = $vo['send_datetime'] ?? date('Y-m-d H:i:s');
+            // 更新订单发货状态
+            if ($order['status'] === 3) {
+                $map = ['order_no' => $vo['order_no']];
+                $this->app->db->name('ShopOrder')->where($map)->update(['status' => 4]);
+            }
         }
     }
 

app/data/controller/ShopOrderSend.php

@@ -2,7 +2,6 @@
 
 namespace app\data\controller;
 
-use app\data\service\OrderService;
 use think\admin\Controller;
 
 /**
@@ -16,10 +15,10 @@ class ShopOrderSend extends Controller
      * 绑定数据表
      * @var string
      */
-    private $table = 'ShopOrder';
+    private $table = 'ShopOrderSend';
 
     /**
-     * 订单数据管理
+     * 订单发货管理
      * @auth true
      * @menu true
      * @throws \think\db\exception\DataNotFoundException
@@ -28,47 +27,42 @@ class ShopOrderSend extends Controller
      */
     public function index()
     {
-        $this->title = '订单数据管理';
+        $this->title = '订单发货管理';
         // 状态数据统计
-        $this->total = ['t0' => 0, 't1' => 0, 't2' => 0, 't3' => 0, 't4' => 0, 't5' => 0, 'ta' => 0];
+        $this->total = ['t0' => 0, 't1' => 0, 't2' => 0, 'ta' => 0];
         $this->app->db->name($this->table)->fieldRaw('status,count(1) total')->group('status')->select()->map(function ($vo) {
             $this->total["t{$vo['status']}"] = $vo['total'];
             $this->total["ta"] += $vo['total'];
         });
         // 订单列表查询
-        $query = $this->_query($this->table);
-        $query->equal('status,payment_type,payment_status');
-        $query->dateBetween('create_at,payment_datetime,cancel_datetime,truck_datetime,truck_send_datetime');
-        $query->like('order_no,truck_name,truck_phone,truck_province|truck_area|truck_address#address,truck_send_no,truck_send_name');
+        $query = $this->_query($this->table)->order('id desc');
+        $query->dateBetween('address_datetime,send_datetime')->equal('status')->like('send_number#truck_number');
+        $query->like('address_phone,address_name,address_province|address_city|address_area|address_content#address_content');
         // 会员搜索查询
         $db = $this->_query('DataMember')->like('phone#member_phone,nickname#member_nickname')->db();
         if ($db->getOptions('where')) $query->whereRaw("mid in {$db->fieldRaw('id')->buildSql()}");
-        // 推荐人搜索查询
-        $db = $this->_query('DataMember')->like('phone#from_phone,nickname#from_nickname')->db();
-        if ($db->getOptions('where')) $query->whereRaw("from in {$db->fieldRaw('id')->buildSql()}");
         // 列表选项卡
         if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) {
             $query->where(['status' => $this->type]);
         }
         // 分页排序处理
         if (input('output') === 'json') {
-            $result = $query->order('id desc')->page(true, false);
+            $result = $query->page(true, false);
             $this->success('获取数据列表成功', $result);
         } else {
-            $query->order('id desc')->page();
+            $query->page();
         }
     }
 
     /**
      * 订单列表处理
      * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     protected function _index_page_filter(array &$data)
     {
-        OrderService::instance()->buildItemData($data);
+        $mids = array_unique(array_column($data, 'mid'));
+        $members = $this->app->db->name('DataMember')->whereIn('id', $mids)->column('*', 'id');
+        foreach ($data as &$vo) $vo['member'] = $members[$vo['mid']] ?? [];
     }
 
 }

app/data/data.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50562
  File Encoding         : 65001
 
- Date: 18/09/2020 13:09:36
+ Date: 18/09/2020 14:43:04
 */
 
 SET NAMES utf8mb4;
@@ -451,52 +451,14 @@ CREATE TABLE `shop_order`  (
   INDEX `idx_shop_order_orderno`(`order_no`) USING BTREE,
   INDEX `idx_shop_order_cancel_status`(`cancel_status`) USING BTREE,
   INDEX `idx_shop_order_payment_status`(`payment_status`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-内容' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-内容' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of shop_order
 -- ----------------------------
-INSERT INTO `shop_order` VALUES (1, 1, 0, 'N20200911492814559', 0.00, 0.00, 0.83, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 02:22:26');
-INSERT INTO `shop_order` VALUES (2, 1, 0, 'N20200911495512556', 0.00, 0.00, 0.59, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 02:22:53');
-INSERT INTO `shop_order` VALUES (3, 1, 0, 'N20200911502330258', 0.00, 0.00, 0.80, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 02:23:21');
-INSERT INTO `shop_order` VALUES (4, 1, 0, 'N20200911504473628', 0.00, 0.00, 0.02, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 02:23:43');
-INSERT INTO `shop_order` VALUES (5, 1, 0, 'N20200911514242495', 0.00, 0.00, 0.06, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 02:24:40');
-INSERT INTO `shop_order` VALUES (6, 1, 0, 'N20200911520162975', 0.00, 0.00, 0.59, 0.00, 0.00, '', '', 0, 0.00, '', '', 1, '会员主动取消订单！', '2020-09-11 14:04:50', 0, 4, 0, '2020-09-11 02:24:59');
-INSERT INTO `shop_order` VALUES (7, 1, 0, 'N20200911600130903', 0.00, 0.00, 0.29, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:26:59');
-INSERT INTO `shop_order` VALUES (8, 1, 0, 'N20200911600295232', 0.00, 0.00, 0.46, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order` VALUES (9, 1, 0, 'N20200911600233650', 0.00, 0.00, 0.29, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order` VALUES (10, 1, 0, 'N20200911600385421', 0.00, 0.00, 0.01, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order` VALUES (11, 1, 0, 'N20200911600369549', 0.00, 0.00, 0.09, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order` VALUES (12, 1, 0, 'N20200911600333848', 0.00, 0.00, 0.38, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order` VALUES (13, 1, 0, 'N20200911600324237', 0.00, 0.00, 0.91, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order` VALUES (14, 1, 0, 'N20200911600356390', 0.00, 0.00, 0.51, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order` VALUES (15, 1, 0, 'N20200911600426190', 0.00, 0.00, 0.93, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order` VALUES (16, 1, 0, 'N20200911600477029', 0.00, 0.00, 0.91, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order` VALUES (17, 1, 0, 'N20200911600436272', 0.00, 0.00, 0.40, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order` VALUES (18, 1, 0, 'N20200911600506447', 0.00, 0.00, 0.24, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order` VALUES (19, 1, 0, 'N20200911600568070', 0.00, 0.00, 0.76, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order` VALUES (20, 1, 0, 'N20200911600544913', 0.00, 0.00, 0.81, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order` VALUES (21, 1, 0, 'N20200911600573331', 0.00, 0.00, 0.76, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order` VALUES (22, 1, 0, 'N20200911600550149', 0.00, 0.00, 0.23, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (23, 1, 0, 'N20200911600528187', 0.00, 0.00, 0.07, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (24, 1, 0, 'N20200911600517358', 0.00, 0.00, 0.35, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (25, 1, 0, 'N20200911600699478', 0.00, 0.00, 0.91, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (26, 1, 0, 'N20200911600665999', 0.00, 0.00, 0.06, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (27, 1, 0, 'N20200911600621891', 0.00, 0.00, 0.70, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (28, 1, 0, 'N20200911600692056', 0.00, 0.00, 0.64, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order` VALUES (29, 1, 0, 'N20200911600615563', 0.00, 0.00, 0.49, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (30, 1, 0, 'N20200911600608048', 0.00, 0.00, 0.85, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (31, 1, 0, 'N20200911600614123', 0.00, 0.00, 0.19, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (32, 1, 0, 'N20200911600726554', 0.00, 0.00, 0.46, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (33, 1, 0, 'N20200911600770479', 0.00, 0.00, 0.18, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (34, 1, 0, 'N20200911600786906', 0.00, 0.00, 1.00, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (35, 1, 0, 'N20200911600733630', 0.00, 0.00, 0.49, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order` VALUES (36, 1, 0, 'N20200911600795096', 0.00, 0.00, 0.74, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order` VALUES (37, 1, 0, 'N20200911600705206', 0.00, 0.00, 0.50, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order` VALUES (38, 1, 0, 'N20200911600719700', 0.00, 0.00, 0.99, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order` VALUES (39, 1, 0, 'N20200911600895782', 0.00, 0.00, 0.61, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order` VALUES (40, 1, 0, 'N20200911600894046', 0.00, 0.00, 0.94, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order` VALUES (41, 1, 0, 'N20200911600847364', 0.00, 0.00, 0.14, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 0, 1, 0, '2020-09-11 08:27:05');
+INSERT INTO `shop_order` VALUES (1, 1, 0, 'N20200918302856917', 43.40, 44.00, 0.60, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 1, 4, 0, '2020-09-18 05:00:12');
+INSERT INTO `shop_order` VALUES (2, 1, 0, 'N20200918312265361', 44.00, 44.00, 0.27, 0.00, 0.00, '', '', 0, 0.00, '', '', 1, '后台未支付的取消', '2020-09-18 13:50:29', 1, 0, 0, '2020-09-18 05:01:06');
+INSERT INTO `shop_order` VALUES (3, 1, 0, 'N20200918312862491', 44.00, 44.00, 1.00, 0.00, 0.00, '', '', 0, 0.00, '', '', 0, '', '', 1, 1, 0, '2020-09-18 05:01:12');
 
 -- ----------------------------
 -- Table structure for shop_order_item
@@ -528,52 +490,14 @@ CREATE TABLE `shop_order_item`  (
   INDEX `idx_shop_order_item_goods_sku`(`goods_sku`) USING BTREE,
   INDEX `idx_shop_order_item_goods_code`(`goods_code`) USING BTREE,
   INDEX `idx_shop_order_item_goods_spec`(`goods_spec`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-商品' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-商品' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of shop_order_item
 -- ----------------------------
-INSERT INTO `shop_order_item` VALUES (1, 1, 'N20200911492814559', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 02:22:26');
-INSERT INTO `shop_order_item` VALUES (2, 1, 'N20200911495512556', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 02:22:53');
-INSERT INTO `shop_order_item` VALUES (3, 1, 'N20200911502330258', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 02:23:21');
-INSERT INTO `shop_order_item` VALUES (4, 1, 'N20200911504473628', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 02:23:43');
-INSERT INTO `shop_order_item` VALUES (5, 1, 'N20200911514242495', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 02:24:40');
-INSERT INTO `shop_order_item` VALUES (6, 1, 'N20200911520162975', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 02:24:59');
-INSERT INTO `shop_order_item` VALUES (7, 1, 'N20200911600130903', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:26:59');
-INSERT INTO `shop_order_item` VALUES (8, 1, 'N20200911600295232', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order_item` VALUES (9, 1, 'N20200911600233650', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order_item` VALUES (10, 1, 'N20200911600385421', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order_item` VALUES (11, 1, 'N20200911600369549', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:00');
-INSERT INTO `shop_order_item` VALUES (12, 1, 'N20200911600333848', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order_item` VALUES (13, 1, 'N20200911600324237', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order_item` VALUES (14, 1, 'N20200911600356390', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order_item` VALUES (15, 1, 'N20200911600426190', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:01');
-INSERT INTO `shop_order_item` VALUES (16, 1, 'N20200911600477029', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order_item` VALUES (17, 1, 'N20200911600436272', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order_item` VALUES (18, 1, 'N20200911600506447', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order_item` VALUES (19, 1, 'N20200911600568070', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order_item` VALUES (20, 1, 'N20200911600544913', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order_item` VALUES (21, 1, 'N20200911600573331', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:02');
-INSERT INTO `shop_order_item` VALUES (22, 1, 'N20200911600550149', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (23, 1, 'N20200911600528187', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (24, 1, 'N20200911600517358', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (25, 1, 'N20200911600699478', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (26, 1, 'N20200911600665999', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (27, 1, 'N20200911600621891', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (28, 1, 'N20200911600692056', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:03');
-INSERT INTO `shop_order_item` VALUES (29, 1, 'N20200911600615563', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (30, 1, 'N20200911600608048', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (31, 1, 'N20200911600614123', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (32, 1, 'N20200911600726554', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (33, 1, 'N20200911600770479', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (34, 1, 'N20200911600786906', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (35, 1, 'N20200911600733630', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:04');
-INSERT INTO `shop_order_item` VALUES (36, 1, 'N20200911600795096', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order_item` VALUES (37, 1, 'N20200911600705206', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order_item` VALUES (38, 1, 'N20200911600719700', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order_item` VALUES (39, 1, 'N20200911600895782', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order_item` VALUES (40, 1, 'N20200911600894046', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:05');
-INSERT INTO `shop_order_item` VALUES (41, 1, 'N20200911600847364', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 0.00, 0.00, 0.00, 0.00, 1, 1, '', 1, 0, '2020-09-11 08:27:05');
+INSERT INTO `shop_order_item` VALUES (1, 1, 'N20200918302856917', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 111.00, 44.00, 111.00, 44.00, 1, 1, '', 1, 0, '2020-09-18 05:00:12');
+INSERT INTO `shop_order_item` VALUES (2, 1, 'N20200918312265361', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 111.00, 44.00, 111.00, 44.00, 1, 1, '', 1, 0, '2020-09-18 05:01:06');
+INSERT INTO `shop_order_item` VALUES (3, 1, 'N20200918312862491', '36152365213', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'S159962280311732', 'G69962280234', '默认分组::默认规格', 111.00, 44.00, 111.00, 44.00, 1, 1, '', 1, 0, '2020-09-18 05:01:12');
 
 -- ----------------------------
 -- Table structure for shop_order_send
@@ -596,9 +520,9 @@ CREATE TABLE `shop_order_send`  (
   `template_amount` decimal(20, 2) UNSIGNED NULL DEFAULT 0.00 COMMENT '配送计算金额',
   `company_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '快递公司编码',
   `company_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '快递公司名称',
-  `company_number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '快递运送单号',
-  `send_datetime` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '发送时间',
-  `send_remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '发送备注',
+  `send_number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '快递运送单号',
+  `send_datetime` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '快递发送时间',
+  `send_remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '快递发送备注',
   `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '商品状态(1使用,0禁用)',
   `deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除状态(0未删,1已删)',
   `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -607,11 +531,12 @@ CREATE TABLE `shop_order_send`  (
   INDEX `idx_shop_order_send_status`(`status`) USING BTREE,
   INDEX `idx_shop_order_send_deleted`(`deleted`) USING BTREE,
   INDEX `idx_shop_order_send_order_no`(`order_no`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-配送' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-配送' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of shop_order_send
 -- ----------------------------
+INSERT INTO `shop_order_send` VALUES (1, 1, 'N20200918302856917', 'A2020091128300', '小小邹', '13617343811', '广东省', '广州市', '天河区', '体育中心11号', '2020-09-18 13:20:22', '', '邮费模板编码无效！', 0.00, 'ZTO', '中通快递', '75341484568973', '2020-09-18 13:36:22', '1235123', 2, 0, '2020-09-18 05:03:06');
 
 -- ----------------------------
 -- Table structure for shop_order_service

app/data/service/OrderService.php

@@ -57,15 +57,19 @@ class OrderService extends Service
      */
     public function buildItemData(array &$data = []): array
     {
+        $nos = array_unique(array_column($data, 'order_no'));
         $mids = array_unique(array_merge(array_column($data, 'mid'), array_column($data, 'from')));
         $members = $this->app->db->name('DataMember')->whereIn('id', $mids)->column('*', 'id');
-        // 商品详情管理
-        $query = $this->app->db->name('ShopOrderItem')->where(['status' => 1, 'deleted' => 0]);
-        $items = $query->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select()->toArray();
+        // 关联商品详情
+        $map = ['status' => 1, 'deleted' => 0];
+        $items = $this->app->db->name('ShopOrderItem')->where($map)->whereIn('order_no', $nos)->select()->toArray();
+        // 关联发货信息
+        $trucks = $this->app->db->name('ShopOrderSend')->whereIn('order_no', $nos)->column('*', 'order_no');
         foreach ($data as &$vo) {
-            [$vo['count'], $vo['items']] = [0, []];
+            $vo['truck'] = $trucks[$vo['order_no']] ?? [];
             $vo['member'] = $members[$vo['mid']] ?? [];
             $vo['fromer'] = $members[$vo['from']] ?? [];
+            [$vo['count'], $vo['items']] = [0, []];
             foreach ($items as $item) {
                 if ($vo['order_no'] === $item['order_no']) {
                     $vo['count'] += $item['stock_sales'];

app/data/view/shop_order/index.html

@@ -19,8 +19,8 @@
                 <th class='list-table-check-td think-checkbox'>
                     <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
                 </th>
-                <th style="width:360px">会员信息</th>
-                <th style="width:360px">订单信息</th>
+                <th>会员信息</th>
+                <th>订单信息</th>
                 <th>发货信息</th>
                 <th>商品信息</th>
             </tr>
@@ -65,26 +65,24 @@
                     </div>
                 </td>
                 <td class="nowrap">
-                    收货信息：{$vo.truck_name|default='--'}<span class="margin-left-5 color-blue">{$vo.truck_phone}</span><br>
-                    收货地址：{$vo.truck_province|default='--'}{$vo.truck_city}{$vo.truck_area}{$vo.truck_address}<br>
-                    发货状态：{if empty($vo.truck_send_code)}
-                    <span class="layui-badge layui-bg-black">未发货</span>
-                    {else}
-                    <span class="layui-badge layui-bg-blue">{$vo.truck_send_name|default='--'}</span>
-                    <a data-title="{$vo.truck_send_name}（{$vo.truck_send_no}）" data-tips-text="快递追踪查询"
-                       data-modal="{:url('truckQuery')}?code={$vo.truck_send_code}&number={$vo.truck_send_no}"
-                       class="layui-badge layui-bg-orange margin-left-5">{$vo.truck_send_no|default='--'}</a>
+                    收货信息：{$vo.truck.address_name|default='--'}<span class="margin-left-5 color-blue">{$vo.truck.address_phone|default=''}</span><br>
+                    收货地址：{$vo.truck.address_province|default='--'}{$vo.truck.address_city|default=''}{$vo.truck.address_area|default=''}{$vo.truck.address_content|default=''}<br>
+                    发货状态：{if empty($vo.truck.company_code)}<span class="layui-badge layui-bg-black">未发货</span>{else}
+                    <span class="layui-badge layui-bg-blue">{$vo.truck.company_name|default='--'}</span>
+                    <a data-title="{$vo.truck.company_name|default=''}（{$vo.truck.send_number|default=''}）" data-tips-text="快递追踪查询"
+                       data-modal="{:url('truckQuery')}?code={$vo.truck.company_code|default=''}&number={$vo.truck.send_number|default=''}"
+                       class="layui-badge layui-bg-orange margin-left-5">{$vo.truck.send_number|default='--'}</a>
                     {/if}
-                    {if $vo.status eq 3}
+                    {if auth('truck') and $vo.status eq 3}
                     <a class="margin-left-5" data-title="填写订单信息" data-modal="{:url('truck')}?order_no={$vo.order_no}">填写发货</a>
-                    {elseif $vo.status eq 4}
+                    {elseif auth('truck') and $vo.status eq 4}
                     <a class="margin-left-5" data-title="修改发货信息" data-modal="{:url('truck')}?order_no={$vo.order_no}">修改发货</a>
                     {/if}
                     <!--{if auth('cancel') and in_array($vo.status, [1,2])}-->
                     <a class="margin-left-5" data-confirm="确认要取消订单吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消订单</a>
                     <!--{/if}-->
                     <br>
-                    发货时间：{$vo.truck_send_datetime|format_datetime}<br>
+                    发货时间：{$vo.truck.send_datetime|default='--'}<br>
                 </td>
                 <td class="nowrap">
                     {foreach $vo.items as $item}

app/data/view/shop_order/index_search.html

@@ -34,7 +34,7 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
             <div class="layui-input-inline">
-                <input name="truck_send_no" value="{:input('truck_send_no')}" placeholder="请输入发货单号" class="layui-input">
+                <input name="truck_send_number" value="{:input('truck_send_number')}" placeholder="请输入发货单号" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
@@ -79,19 +79,19 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
             <div class="layui-input-inline">
-                <input name="truck_name" value="{:input('truck_name')}" placeholder="请输入收货姓名" class="layui-input">
+                <input name="truck_address_name" value="{:input('truck_address_name')}" placeholder="请输入收货姓名" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
             <div class="layui-input-inline">
-                <input name="truck_phone" value="{:input('truck_phone')}" placeholder="请输入收货手机" class="layui-input">
+                <input name="truck_address_phone" value="{:input('truck_address_phone')}" placeholder="请输入收货手机" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货地址</label>
             <div class="layui-input-inline">
-                <input name="address" value="{:input('address')}" placeholder="请输入收货省份" class="layui-input">
+                <input name="truck_address_content" value="{:input('truck_address_content')}" placeholder="请输入收货省份" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">

app/data/view/shop_order/truck.html

@@ -6,16 +6,16 @@
                 <label class="layui-col-xs6 relative block">
                     <span class="color-green font-w7 label-required-prev">收货人姓名</span>
                     <span class="color-desc margin-left-5">Consignee Name</span>
-                    <input class="layui-input" required placeholder="请输入收货姓名" name="truck_name" value="{$vo.truck_name|default=''}">
+                    <input class="layui-input" required placeholder="请输入收货姓名" name="address_name" value="{$vo.address_name|default=''}">
                 </label>
                 <label class="layui-col-xs6 relative block">
                     <span class="color-green font-w7 label-required-prev">收货人手机</span>
                     <span class="color-desc margin-left-5">Consignee's mobile phone</span>
-                    <input class="layui-input" required placeholder="请输入收货人手机" name="truck_phone" value="{$vo.truck_phone|default=''}">
+                    <input class="layui-input" required placeholder="请输入收货人手机" name="address_phone" value="{$vo.address_phone|default=''}">
                 </label>
                 <div class="layui-col-xs12 relative block">
                     <span class="color-green font-w7 label-required-prev">收货所在区域</span>
-                    <span class="color-desc margin-left-5">（原区域： {$vo.truck_province|default='--'} {$vo.truck_city|default=''} {$vo.truck_area|default=''} ）</span>
+                    <span class="color-desc margin-left-5">（原区域： {$vo.address_province|default='--'} {$vo.address_city|default=''} {$vo.address_area|default=''} ）</span>
                     <div class="layui-row layui-col-space10">
                         <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_province"></select></label>
                         <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_city"></select></label>
@@ -24,8 +24,8 @@
                 </div>
                 <label class="layui-col-xs12 relative block">
                     <span class="color-green font-w7 label-required-prev">收货详细地址</span>
-                    <span class="color-desc margin-left-5">（原地址： {$vo.truck_address|default=""} )</span>
-                    <input name="truck_address" required value='{$vo.truck_address|default=""}' placeholder="请输入收货地址" class="layui-input">
+                    <span class="color-desc margin-left-5">（原地址： {$vo.address_content|default=""} )</span>
+                    <input name="address_content" required value='{$vo.address_content|default=""}' placeholder="请输入收货地址" class="layui-input">
                 </label>
             </div>
         </fieldset>
@@ -34,9 +34,9 @@
             <label class="layui-form-item relative block">
                 <span class="color-green font-w7 label-required-prev">快递配送公司</span>
                 <span class="color-desc margin-left-5">Express delivery company</span>
-                <select data-truck-code class="layui-select" name="truck_send_code" lay-search>
+                <select data-truck-code class="layui-select" name="company_code" lay-search>
                     {foreach $items as $item}
-                    {if $vo.truck_send_code eq $item.code_1}
+                    {if isset($vo.company_code) and $vo.company_code eq $item.code_1}
                     <option selected value="{$item.code_1}">{$item.name} ( {$item.code_1} )</option>
                     {else}
                     <option value="{$item.code_1}">{$item.name} ( {$item.code_1} )</option>
@@ -46,17 +46,18 @@
             <label class="layui-form-item relative block">
                 <span class="color-green font-w7 label-required-prev">快递配送单号</span>
                 <span class="color-desc margin-left-5">Express delivery number</span>
-                <input data-truck-number name="truck_send_no" required value='{$vo.truck_send_no|default=""}' placeholder="请输入快递配送单号" class="layui-input">
+                <input data-truck-number name="send_number" required value='{$vo.send_number|default=""}' placeholder="请输入快递配送单号" class="layui-input">
             </label>
             <label class="layui-form-item relative block">
                 <span class="color-green font-w7">快递配送描述</span>
                 <span class="color-desc margin-left-5">Express delivery description</span>
-                <textarea placeholder="请输入快递配送描述" class="layui-textarea" name="truck_send_remark">{$vo.truck_send_remark|default=""}</textarea>
+                <textarea placeholder="请输入快递配送描述" class="layui-textarea" name="send_remark">{$vo.send_remark|default=""}</textarea>
             </label>
         </fieldset>
     </div>
     <div class="hr-line-dashed"></div>
     {notempty name='vo.order_no'}<input type='hidden' value='{$vo.order_no}' name='order_no'>{/notempty}
+    {notempty name='vo.send_datetime'}<input type='hidden' value='{$vo.send_datetime}' name='send_datetime'>{/notempty}
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
@@ -67,7 +68,7 @@
         (function (province, city, area) {
             new PCAS("form_province", "form_city", "form_area", province, city, area);
             window.form.render();
-        })('{$vo.truck_province|default=""}', '{$vo.truck_city|default=""}', '{$vo.truck_area|default=""}');
+        })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
     });
     $('[data-express-query]').on('click', function () {
         (function (code, number) {

app/data/view/shop_order_send/index.html

@@ -3,7 +3,7 @@
 {block name="content"}
 <div class="layui-tab layui-tab-card">
     <ul class="layui-tab-title notselect">
-        {foreach ['ta'=>'全部订单','t2'=>'待支付的订单','t3'=>'待发货的订单','t4'=>'待收货的订单','t5'=>'已完成的订单','t0'=>'已取消的订单'] as $k=>$v}
+        {foreach ['ta'=>'全部订单','t1'=>'待发货的订单','t2'=>'已发货的订单','t0'=>'已取消的订单'] as $k => $v}
         {if isset($type) and 't'.$type eq $k}
         <li data-open="{:url('index')}?type={$k}" class="layui-this">{$v} <sup class="layui-badge absolute border-radius">{$total[$k]??0}</sup></li>
         {else}
@@ -11,7 +11,7 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content think-box-shadow">
-        {include file='shop_order/index_search'}
+        {include file='shop_order_send/index_search'}
         <table class="layui-table margin-top-10" lay-skin="line">
             {notempty name='list'}
             <thead>
@@ -19,10 +19,10 @@
                 <th class='list-table-check-td think-checkbox'>
                     <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
                 </th>
-                <th style="width:360px">会员信息</th>
-                <th style="width:360px">订单信息</th>
-                <th>发货信息</th>
-                <th>商品信息</th>
+                <th>会员信息</th>
+                <th>收货信息</th>
+                <th>发货状态</th>
+                <th></th>
             </tr>
             </thead>
             {/notempty}
@@ -33,68 +33,35 @@
                     <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
                 </td>
                 <td class="nowrap relative">
-                    <div>
-                        <img data-tips-image style="width:35px;height:35px" src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
-                        <div class="inline-block text-middle sub-span-blue">
-                            推荐会员：{$vo.fromer.nickname|default='--'}<br>
-                            推荐手机：<span>{$vo.fromer.phone|default='--'}</span>{notempty name='vo.fromer.vip_level'} [ <b class="color-red">VIP{$vo.fromer.vip_level}</b> ] <b class="color-red">{$vo.fromer.vip_title}</b>{/notempty}<br>
-                        </div>
-                    </div>
-                    <div>
-                        <img data-tips-image style="width:35px;height:35px" src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
-                        <div class="inline-block text-middle sub-span-blue">
-                            会员昵称：{$vo.member.nickname|default='--'}<br>
-                            会员手机：<span>{$vo.member.phone|default='--'}</span>{notempty name='vo.member.vip_level'} [ <b class="color-red">VIP{$vo.member.vip_level}</b> ] <b class="color-red">{$vo.member.vip_title}</b>{/notempty}<br>
-                        </div>
+                    <img data-tips-image style="width:55px;height:55px" src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
+                    <div class="inline-block text-middle sub-span-blue">
+                        会员昵称：{$vo.member.nickname|default='--'}<br>
+                        会员手机：<span>{$vo.member.phone|default='--'}</span><br>
+                        订单单号：<span>{$vo.order_no|default='--'}</span><br>
                     </div>
                 </td>
-                <td class='nowrap'>
-                    <div class="inline-block margin-right-5 think-badge-middle notselect padding-left-5">
-                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-gray" data-tips-text="{$vo.cancel_remark}">已取消</span>{/eq}
-                        {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-red">预订单</span>{/eq}
-                        {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-orange">待付款</span>{/eq}
-                        {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-black">待发货</span>{/eq}
-                        {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-green">已发货</span>{/eq}
-                        {eq name='vo.status' value='5'}<span class="layui-badge layui-bg-blue">已完成</span>{/eq}
-                    </div>
-                    <div class="inline-block text-middle">
-                        订单单号：<span class="color-blue">{$vo.order_no|default=''}</span><br>
-                        订单金额：<b class="color-blue">{$vo.amount_total+0}</b> 元<span class="color-blue">{if $vo.amount_express>0}（含{$vo.amount_express+0}元）{else}（包邮）{/if}</span>已支付 <strong class="color-blue">{$vo.payment_amount+0}</strong> 元<br>
-                        下单时间：{$vo.create_at|format_datetime}<br>
-                        支付时间：{$vo.payment_datetime|format_datetime}{if $vo.payment_datetime}<span class="color-blue"> ({$vo.pay_type|default='-'})</span>{/if}<br>
-                    </div>
+                <td class="nowrap">
+                    收货姓名：{$vo.address_name|default='--'}<span class="margin-left-5 color-blue">{$vo.address_phone}</span><br>
+                    收货地址：{$vo.address_province|default='--'}{$vo.address_city}{$vo.address_area}{$vo.address_content}<br>
+                    提交时间：{$vo.address_datetime|format_datetime}<br>
                 </td>
                 <td class="nowrap">
-                    收货信息：{$vo.truck_name|default='--'}<span class="margin-left-5 color-blue">{$vo.truck_phone}</span><br>
-                    收货地址：{$vo.truck_province|default='--'}{$vo.truck_city}{$vo.truck_area}{$vo.truck_address}<br>
-                    发货状态：{if empty($vo.truck_send_code)}
+                    {if empty($vo.send_datetime)}
                     <span class="layui-badge layui-bg-black">未发货</span>
                     {else}
-                    <span class="layui-badge layui-bg-blue">{$vo.truck_send_name|default='--'}</span>
-                    <a data-title="{$vo.truck_send_name}（{$vo.truck_send_no}）" data-tips-text="快递追踪查询"
-                       data-modal="{:url('truckQuery')}?code={$vo.truck_send_code}&number={$vo.truck_send_no}"
-                       class="layui-badge layui-bg-orange margin-left-5">{$vo.truck_send_no|default='--'}</a>
+                    <span class="layui-badge layui-bg-blue">{$vo.company_name|default='--'}</span>
+                    <a data-title="{$vo.company_name}（{$vo.send_number}）" data-tips-text="快递追踪查询"
+                       data-modal="{:url('truckQuery')}?code={$vo.send_number}&number={$vo.send_number}"
+                       class="layui-badge layui-bg-orange margin-left-5">{$vo.send_number|default='--'}</a>
+                    <div class="margin-top-5">于 {$vo.send_datetime|format_datetime} 发货！<br></div>
                     {/if}
-                    {if $vo.status eq 3}
+                </td>
+                <td class="color-desc">
+                    {if $vo.status eq 1}
                     <a class="margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?order_no={$vo.order_no}">填写发货</a>
-                    {elseif $vo.status eq 4}
+                    {elseif $vo.status eq 2}
                     <a class="margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?order_no={$vo.order_no}">修改发货</a>
                     {/if}
-                    <!--{if auth('cancel') and in_array($vo.status, [1,2])}-->
-                    <a class="margin-left-5" data-confirm="确认要取消订单吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消订单</a>
-                    <!--{/if}-->
-                    <br>
-                    发货时间：{$vo.truck_send_datetime|format_datetime}<br>
-                </td>
-                <td class="nowrap">
-                    {foreach $vo.items as $item}
-                    <div>
-                        <b class="color-blue">{$item.stock_sales|default=0}件</b>
-                        <b class="color-red">x</b>
-                        <b class="color-blue">{$item.price_market+0}元 </b>
-                        {$item.goods_name|default=''} <span class="color-green">( {$item.goods_spec|think_show_goods_spec})</span>
-                    </div>
-                    {/foreach}
                 </td>
             </tr>
             {/foreach}

app/data/view/shop_order_send/index_search.html

@@ -14,18 +14,6 @@
             </div>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">推荐手机</label>
-            <div class="layui-input-inline">
-                <input name="agent_phone" value="{:input('agent_phone')}" placeholder="请输入会员手机" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">推荐昵称</label>
-            <div class="layui-input-inline">
-                <input name="agent_nickname" value="{:input('agent_nickname')}" placeholder="请输入会员昵称" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
             <div class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
@@ -34,102 +22,79 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
             <div class="layui-input-inline">
-                <input name="express_send_no" value="{:input('express_send_no')}" placeholder="请输入发货单号" class="layui-input">
+                <input name="truck_number" value="{:input('truck_number')}" placeholder="请输入发货单号" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单状态</label>
+            <label class="layui-form-label">发货状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
+                    {foreach [''=>'- 全部订单 -','0'=>'已取消的订单','1'=>'待发货的订单','2'=>'已发货的订单'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">付款状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="pay_state">
-                    {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
-                    {if input('pay_state') eq $k.''}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
             </div>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">下单时间</label>
+            <label class="layui-form-label">提交时间</label>
             <div class="layui-input-inline">
-                <input data-date-range name="create_at" value="{:input('create_at')}" placeholder="请选择下单时间" class="layui-input">
+                <input data-date-range name="address_datetime" value="{:input('address_datetime')}" placeholder="请选择提交时间" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付时间</label>
+            <label class="layui-form-label">发货时间</label>
             <div class="layui-input-inline">
-                <input data-date-range name="pay_datetime" value="{:input('pay_datetime')}" placeholder="请选择支付时间" class="layui-input">
+                <input data-date-range name="send_datetime" value="{:input('send_datetime')}" placeholder="请选择发货时间" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
             <div class="layui-input-inline">
-                <input name="express_name" value="{:input('express_name')}" placeholder="请输入收货姓名" class="layui-input">
+                <input name="address_name" value="{:input('address_name')}" placeholder="请输入收货姓名" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
             <div class="layui-input-inline">
-                <input name="express_phone" value="{:input('express_phone')}" placeholder="请输入收货手机" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货省份</label>
-            <div class="layui-input-inline">
-                <input name="express_province" value="{:input('express_province')}" placeholder="请输入收货省份" class="layui-input">
+                <input name="address_phone" value="{:input('address_phone')}" placeholder="请输入收货手机" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货城市</label>
+            <label class="layui-form-label">配送地址</label>
             <div class="layui-input-inline">
-                <input name="express_city" value="{:input('express_city')}" placeholder="请输入收货城市" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货区域</label>
-            <div class="layui-input-inline">
-                <input name="express_area" value="{:input('express_area')}" placeholder="请输入收货区域" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">详细地址</label>
-            <div class="layui-input-inline">
-                <input name="express_address" value="{:input('express_address')}" placeholder="请输入详细地址" class="layui-input">
+                <input name="address_content" value="{:input('address_content')}" placeholder="请输入配送地址" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             {if auth('export')}
-            <button type="button" data-export-list class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-export"></i> 导 出</button>
+            <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-export"></i> 导 出</button>
             {/if}
         </div>
     </form>
     <script>
         window.form.render();
-    </script>
-    {if auth('export')}
-    <script>
-        $('[data-export-list]').on('click', function () {
-            $.form.load('{:url("export")}?type={$type|default=""}', $(this).parents('form').serialize(), 'get', function (ret) {
-                if (ret.code > 0) return $.loadQueue(ret.data), false;
-            })
+        require(['excel'], function (excel) {
+            excel.bind(function (data) {
+                data.forEach(function (item, index) {
+                    data[index] = [
+                        item.order_no, item.member.phone,
+                        item.member.username || item.member.nickname || '',
+                        item.address_name || '', item.address_phone || '',
+                        item.address_province || '', item.address_city || '', item.address_area || '',
+                        item.address_content || '', item.address_datetime || '',
+                        item.company_name || '', item.send_number || '', item.send_datetime || '',
+                    ];
+                });
+                data.unshift([
+                    '订单单号', '会员手机', '会员姓名', '收货人姓名', '收货人手机', '配送省份', '配送城市',
+                    '配送区域', '配送详细地址', '提交时间', '快递公司', '配送单号', '发货时间'
+                ]);
+                return data;
+            }, '订单发货数据');
         });
     </script>
-    {/if}
 </fieldset>

config/view.php

@@ -23,7 +23,7 @@ return [
     // 模板后缀
     'view_suffix'        => 'html',
     // 去除HTML空格换行
-    'strip_space'        => true,
+    'strip_space'        => false,
     // 模板文件名分隔符
     'view_depr'          => DIRECTORY_SEPARATOR,
     // 模板缓存配置