订单有效期

biz-ghs/order/classes/OrderClass.php

@@ -119,8 +119,10 @@ class OrderClass extends BaseClass
         //将花店每月的总   订单数作为编号
         $data['sendNum'] = StatOrderCountClass::addOrder($month, $sjId);
         $data['sendTime'] = isset($data['sendTime']) && !empty($data['sendTime']) ? $data['sendTime'] : '0000-00-00 00:00:00';
-        //订单30分钟后过期
-        $data['deadline'] = date("Y-m-d H:i:s", (time() + 1800));
+        //订单有效期
+        $validTime = dict::getDict('sale_purchase_order_valid');
+        $current = time() + $validTime;
+        $data['deadline'] = date("Y-m-d H:i:s", $current);
         $data['status'] = self::ORDER_STATUS_UN_PAY;
 
         //计算总重量(kg)
@@ -514,6 +516,16 @@ class OrderClass extends BaseClass
         }
         $order->status = self::ORDER_STATUS_CANCEL;
         $order->save();
+
+        $shopId = $order->shopId;
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $shop->unPayOrder -= 1;
+        $shop->cancelOrder += 1;
+        $shop->save();
+
         return $order;
     }
 

biz-hd/purchase/classes/PurchaseClass.php

@@ -8,6 +8,7 @@ use bizGhs\admin\classes\AdminClass;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\product\classes\ProductClass;
 use bizHd\purchase\models\Purchase;
+use common\components\dict;
 use common\components\orderSn;
 use common\components\util;
 use bizHd\base\classes\BaseClass;
@@ -124,8 +125,9 @@ class PurchaseClass extends BaseClass
         $data['actPrice'] = $actPrice;
         $data['bigNum'] = $bigNum;
         $data['smallNum'] = $smallNum;
-        //采购单5分钟有效期
-        $current = time() + 300;
+        //采购单有效期
+        $validTime = dict::getDict('sale_purchase_order_valid');
+        $current = time() + $validTime;
         $data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
         $respond = self::add($data, true);
         if (isset($data['product']) == false || empty($data['product'])) {

common/components/dict.php

@@ -9,6 +9,9 @@ class dict
 
     public static $data = [
 
+        //采购和销售单的有效期
+        'sale_purchase_order_valid' => 300,
+
         //需要显示国兰的信息 0不需要 1需要（要审核小程序请显示国兰信息）
         'showGlInfo' => 1,
         //显示零售和供货商的演示入口
@@ -116,15 +119,15 @@ class dict
 
         //模板消息 平台类型： 1花店，2供货商，3商城
         'tMessage' => [
-           1=>[
-                'OPENTM418105100'=>'下单成功通知',
-           ],
-           2=>[
-               'OPENTM418105100'=>'下单成功通知',
-           ],
-           3=>[
-               'OPENTM418105100'=>'下单成功通知',
-           ],
+            1 => [
+                'OPENTM418105100' => '下单成功通知',
+            ],
+            2 => [
+                'OPENTM418105100' => '下单成功通知',
+            ],
+            3 => [
+                'OPENTM418105100' => '下单成功通知',
+            ],
         ],
 
         //用户来源