过期时间的控制

app-ghs/controllers/OrderController.php

@@ -127,7 +127,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $info = OrderClass::getOrderInfo($id);
+        $info = OrderService::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);
         OrderClass::debt($info, $this->shop);
         util::complete();
@@ -209,7 +209,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $info = OrderClass::getOrderInfo($id, true, true, true, false);
+        $info = OrderService::getOrderInfo($id, true, true, true, false);
         OrderClass::valid($info, $this->shopId);
         util::success($info);
     }
@@ -219,7 +219,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $info = OrderClass::getOrderInfo($id);
+        $info = OrderService::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);
         OrderService::withoutSend($info);
         util::complete();
@@ -230,7 +230,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
-        $info = OrderClass::getOrderInfo($id);
+        $info = OrderService::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
@@ -287,7 +287,7 @@ class OrderController extends BaseController
             }
         }
         //更新订单表
-        $info = OrderClass::getOrderInfo($orderId);
+        $info = OrderService::getOrderInfo($orderId);
         OrderClass::valid($info, $this->shopId);
         $expressAddInfo = [
             'customName' => $customName,
@@ -319,7 +319,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
-        $info = OrderClass::getOrderInfo($id);
+        $info = OrderService::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();

app-ghs/controllers/OrderItemController.php

@@ -4,6 +4,7 @@ namespace ghs\controllers;
 
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\OrderItemClass;
+use bizGhs\order\services\OrderService;
 use bizGhs\product\classes\ProductClass;
 use common\components\util;
 use Yii;
@@ -23,7 +24,7 @@ class OrderItemController extends BaseController
         //检查花材是否都是同家门店的
         ProductClass::valid($product, $this->shopId);
 
-        $info = OrderClass::getOrderInfo($id);
+        $info = OrderService::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);
 
         //添加修改花材

app-hd/controllers/PurchaseController.php

@@ -146,7 +146,7 @@ class PurchaseController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $info = PurchaseClass::getInfo($id, true, true);
+        $info = PurchaseService::getInfo($id, true, true);
         PurchaseClass::valid($info, $this->shopId);
         util::success($info);
     }

biz-ghs/order/classes/OrderClass.php

@@ -351,17 +351,6 @@ class OrderClass extends BaseClass
         util::fail('没有权限操作的订单');
     }
 
-    //获取订单详情 ssh 2021.1.21
-    public static function getOrderInfo($id, $showButton = false, $showItem = false, $showExpress = false, $isList = false)
-    {
-        $info = self::getById($id);
-        if (empty($info)) {
-            util::fail('没有找到订单');
-        }
-        $respond = self::groupOrder([$info], $showButton, $showItem, $showExpress, $isList);
-        return current($respond);
-    }
-
     //订单到期未付款未确认的订单置成取消状态 ssh 2021.1.23
     public static function setExpire($order)
     {

biz-ghs/order/services/OrderService.php

@@ -363,12 +363,31 @@ class OrderService extends BaseService
         return ['price' => $discountPrice, 'discountType' => $discountType, 'discountAmount' => $discountAmount];
     }
 
+    //获取订单详情 ssh 2021.1.21
+    public static function getOrderInfo($id, $showButton = false, $showItem = false, $showExpress = false, $isList = false)
+    {
+        $order = OrderClass::getById($id, true);
+        if (empty($order)) {
+            util::fail('没有找到订单');
+        }
+        $order = self::expire($order);
+        $info = $order->attributes;
+        $respond = OrderClass::groupOrder([$info], $showButton, $showItem, $showExpress, $isList);
+        return current($respond);
+    }
+
     //订单失效后的操作 shish 2021.5.14
-    public static function expire($id)
+    public static function expire($order)
     {
-        $order = OrderClass::cancel($id);
-        $purchaseId = $order->purchaseId;
-        PurchaseClass::cancel($purchaseId);
+        $date = date("Y-m-d H:i:s");
+        if ($order->status == OrderClass::ORDER_STATUS_UN_PAY && $order->deadline <= $date) {
+            $id = $order->id;
+            $order = OrderClass::cancel($id);
+            $purchaseId = $order->purchaseId;
+            PurchaseClass::cancel($purchaseId);
+            return $order;
+        }
+        return $order;
     }
 
     //支付成功后的流程 shish 2021.5.14

biz-hd/purchase/classes/PurchaseClass.php

@@ -134,14 +134,6 @@ class PurchaseClass extends BaseClass
         return $respond;
     }
 
-    //获取采购单信息 ssh 2021.1.24
-    public static function getInfo($id, $showButton = false, $showProduct = false)
-    {
-        $info = self::getById($id);
-        $respond = self::groupPurchase([$info], $showButton, $showProduct);
-        return current($respond);
-
-    }
 
     //组合数据 ssh 2021.1.25
     public static function groupPurchase($list, $showButton = false, $showProduct = false)
@@ -217,11 +209,11 @@ class PurchaseClass extends BaseClass
         $purchase->status = self::STATUS_CANCEL;
         $purchase->save();
         //供货商那边加回库存
-        $orderSn = $purchase->orderSn;
-        $purchaseItem = PurchaseItemClass::getAllByCondition(['orderSn' => $orderSn], null, "*");
-        foreach ($purchaseItem as $v) {
-            ProductClass::addStockByItemNum($v['ghsProductId'], $v['itemNum']);
-        }
+//        $orderSn = $purchase->orderSn;
+//        $purchaseItem = PurchaseItemClass::getAllByCondition(['orderSn' => $orderSn], null, "*");
+//        foreach ($purchaseItem as $v) {
+//            ProductClass::addStockByItemNum($v['ghsProductId'], $v['itemNum']);
+//        }
         return $purchase;
     }
 

biz-hd/purchase/services/PurchaseService.php

@@ -76,6 +76,19 @@ class PurchaseService extends BaseService
         return $respond;
     }
 
+    //获取采购单信息 ssh 2021.1.24
+    public static function getInfo($id, $showButton = false, $showProduct = false)
+    {
+        $purchase = PurchaseClass::getById($id, true);
+        if (empty($purchase)) {
+            util::fail('没有找到采购单');
+        }
+        $purchase = self::expire($purchase);
+        $info = $purchase->attributes;
+        $respond = PurchaseClass::groupPurchase([$info], $showButton, $showProduct);
+        return current($respond);
+    }
+
     //采购记录 ssh 2021.1.24
     public static function getPurchaseList($where)
     {
@@ -105,13 +118,19 @@ class PurchaseService extends BaseService
     }
 
     //采购单失效 shish 2021.5.14
-    public static function expire($id)
+    public static function expire($purchase)
     {
-        //采购单失效
-        $purchase = PurchaseClass::cancel($id);
-        $saleId = $purchase->saleId;
-        //销售单失效
-        OrderClass::cancel($saleId);
+        $date = date("Y-m-d H:i:s");
+        if ($purchase->status == PurchaseClass::STATUS_UN_PAY && $purchase->deadline <= $date) {
+            //采购单失效
+            $id = $purchase->id;
+            $purchase = PurchaseClass::cancel($id);
+            $saleId = $purchase->saleId;
+            //销售单失效
+            OrderClass::cancel($saleId);
+            return $purchase;
+        }
+        return $purchase;
     }
 
     //订单延期支付 ssh 2021.1.24

console/controllers/PurchaseController.php

@@ -5,13 +5,14 @@ namespace console\controllers;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\models\Purchase;
 use bizHd\purchase\services\PurchaseService;
+use common\components\noticeUtil;
 use yii\console\Controller;
 use Yii;
 
 class PurchaseController extends Controller
 {
 
-    //采购订单过期变更状态 shish 2021.5.14
+    //采购订单过期变更 shish 2021.5.14
     // ./yii purchase/expire-order
     // /usr/local/nginx/html/huahuibao/yii purchase/expire-order
     public function actionExpireOrder()
@@ -41,9 +42,9 @@ class PurchaseController extends Controller
             }
         } catch (Exception $e) {
             $transaction->rollBack();
-            echo 'error';
+            $msg = $e->getMessage();
+            noticeUtil::push("采购订单过期变更报错：{$msg}", '15280215347');
         }
-        echo 'ok';
     }
 
 }