过期时间

app-hd/controllers/OrderController.php

@@ -304,8 +304,8 @@ class OrderController extends BaseController
         $post['payWay'] = $this->isWx == true ? 0 : 1;
         $post['mainId'] = $this->mainId ?? 0;
         $now = time();
-        //订单30分钟后过期
-        $expireTime = $now + 1800;
+        $orderValidTime = getenv('ORDER_VALID_TIME') == false ? 600 : getenv('ORDER_VALID_TIME');
+        $expireTime = $now + $orderValidTime;
         $post['deadline'] = $expireTime;
         $post['staffId'] = $this->shopAdminId ?? 0;
         $post['staffName'] = $this->shopAdmin->name ?? '';
@@ -341,7 +341,6 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             $post['product'] = $productList;
-            $post['deadline'] = date("Y-m-d H:i:s", strtotime('+360 day'));
             $return = OrderService::createFinishOrder($post, $custom, $hasPay);
             $transaction->commit();
             //订单生成时唤起在线打印

biz-hd/order/services/OrderService.php

@@ -37,8 +37,6 @@ class OrderService extends BaseService
         $sjId = $data['sjId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
         $mainId = $data['mainId'] ?? 0;
-        $staffId = $data['staffId'] ?? 0;
-        $staffName = $data['staffName'] ?? '';
 
         $groupCover = '';