订单详情

biz-ghs/order/classes/OrderClass.php

@@ -85,7 +85,7 @@ class OrderClass extends BaseClass
     }
 
     //整合订单员工和供货商等信息 shish 2021.1.19
-    public static function groupOrder($list, $showButton = false, $showProgress = false)
+    public static function groupOrder($list, $showButton = false, $showProgress = false, $showProdct = false)
     {
         if (empty($list)) {
             return $list;
@@ -119,6 +119,14 @@ class OrderClass extends BaseClass
                     ['name' => '出库', 'complete' => 0],
                 ];
             }
+            if ($showProdct) {
+                $list[$key]['product'] = [
+                    [
+                        'cover' => 'https://img.huahb.com/uploads/12358/202101/13/0e713d46064ca89b1fb11095b710f244_small.jpeg',
+                        'name' => '昆明B级红玫瑰卡罗拉', 'property' => 'B级', 'price' => '8.45', 'bigNum' => 2, 'smallNum' => 10
+                    ],
+                ];
+            }
         }
         return $list;
     }
@@ -135,7 +143,7 @@ class OrderClass extends BaseClass
     public static function getOrderInfo($id)
     {
         $info = self::getById($id);
-        $respond = self::groupOrder([$info], true, true);
+        $respond = self::groupOrder([$info], true, true, true);
         return current($respond);
     }
 

sql.sql

@@ -790,4 +790,4 @@ ALTER TABLE xhGhsCheckOrderItem MODIFY `orderSn` CHAR(20) NOT NULL DEFAULT '' CO
 ALTER TABLE xhPurchase MODIFY `orderSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号';
 ALTER TABLE xhGhsStockOrder MODIFY `orderSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号';
 ALTER TABLE xhGhsStockOrderItem MODIFY `orderSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号';
-
+ALTER TABLE `xhGhsOrder` ADD outTime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '出库时间' AFTER `payTime`;