订单有效期

app-ghs/controllers/OrderController.php

@@ -719,7 +719,7 @@ class OrderController extends BaseController
             $post['product'] = $productList;
 
             //商家开单订单有效期，到期记欠款
-            $validTime = dict::getDict('sale_purchase_order_valid');
+            $validTime = dict::getDict('order_pay_has_time');
             $current = time() + $validTime;
             $post['deadline'] = date("Y-m-d H:i:s", $current);
 

app-hd/controllers/PurchaseClearController.php

@@ -43,7 +43,7 @@ class PurchaseClearController extends BaseController
         $post['customShopAdminName'] = $shopAdminName;
         $respond = PurchaseClearClass::addOrder($post, $ghs);
         //前端显示的付款倒计时
-        $remainSecond = dict::getDict('sale_purchase_order_valid');
+        $remainSecond = dict::getDict('order_pay_has_time');
         $respond['remainSecond'] = $remainSecond;
         util::success($respond);
     }

app-hd/controllers/ShopController.php

@@ -256,8 +256,9 @@ class ShopController extends BaseController
 
         $current = time();
         $cgDeadTime = strtotime($cg->deadline);
-        //让客户在失效前60前支付成功，这样回调通知时订单才不会过期状态
-        $count = ($cgDeadTime - $current - 60) > 0 ? ($cgDeadTime - $current) : 0;
+        //让客户在失效前$aheadTime秒要支付，这样回调通知时订单才不会过期状态
+        $aheadTime = dict::getDict('order_online_pay_has_ahead_time');
+        $count = ($cgDeadTime - $current - $aheadTime) > 0 ? ($cgDeadTime - $current) : 0;
 
         $data = [];
         $data['balance'] = $this->shop->balance ?? 0;

biz-ghs/order/classes/OrderClass.php

@@ -165,7 +165,7 @@ class OrderClass extends BaseClass
 
         $data['sendTimeWant'] = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
         //订单有效期
-        $validTime = dict::getDict('sale_purchase_order_valid');
+        $validTime = dict::getDict('order_pay_has_time');
         $current = time() + $validTime;
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
         $data['status'] = self::ORDER_STATUS_UN_PAY;
@@ -210,7 +210,7 @@ class OrderClass extends BaseClass
 
         //订单有效期
         $currentTime = time();
-        $validTime = dict::getDict('sale_purchase_order_valid');
+        $validTime = dict::getDict('order_pay_has_time');
         $current = $currentTime + $validTime;
         $data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
         //订单自动记为欠款单时间
@@ -267,7 +267,7 @@ class OrderClass extends BaseClass
 
         $data['sendTime'] = isset($data['sendTime']) && !empty($data['sendTime']) ? $data['sendTime'] : '0000-00-00 00:00:00';
         //订单有效期
-        $validTime = dict::getDict('sale_purchase_order_valid');
+        $validTime = dict::getDict('order_pay_has_time');
         $current = time() + $validTime;
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
         $data['status'] = self::ORDER_STATUS_UN_PAY;

biz-hd/purchase/classes/PurchaseClass.php

@@ -198,7 +198,7 @@ class PurchaseClass extends BaseClass
 
         //采购单有效期
         $currentTime = time();
-        $validTime = dict::getDict('sale_purchase_order_valid');
+        $validTime = dict::getDict('order_pay_has_time');
         $current = $currentTime + $validTime;
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
         //采购单自动记为欠款单时间
@@ -369,7 +369,7 @@ class PurchaseClass extends BaseClass
         $data['bigNum'] = $bigNum;
         $data['smallNum'] = $smallNum;
         //采购单有效期
-        $validTime = dict::getDict('sale_purchase_order_valid');
+        $validTime = dict::getDict('order_pay_has_time');
         $current = time() + $validTime;
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
 

biz-hd/purchase/classes/PurchaseClearClass.php

@@ -62,7 +62,7 @@ class PurchaseClearClass extends BaseClass
         $data['actPrice'] = $totalPrice;
         $data['realPrice'] = $totalPrice;
         $data['orderSn'] = $orderSn;
-        $validTime = dict::getDict('sale_purchase_order_valid');
+        $validTime = dict::getDict('order_pay_has_time');
         $deadTime = time() + $validTime;
         $data['deadline'] = date("Y-m-d H:i:s", $deadTime);
         $arr = [

common/components/dict.php

@@ -51,8 +51,11 @@ class dict
         //商家开了待付款单客户未付款自动标记欠款单时间，单位为秒
         'local_gys_kd_auto_set_debt_time' => 30,
 
+
         //客户采购订单有效期是多少秒，有效期内可以支付，到期自动取消。由于未付款单自动标记为欠款，商家开的订单不过期。
-        'sale_purchase_order_valid' => 30,
+        'order_pay_has_time' => 90,
+        //线上支付时在订单有效期多久前还能支付
+        'order_online_pay_has_ahead_time' => 60,
 
         'expressList' => [
             [