结账

app-hd/controllers/ClearController.php

@@ -6,12 +6,41 @@ use biz\ghs\classes\GhsClass;
 use bizGhs\clear\classes\ClearClass;
 use bizGhs\clear\services\ClearService;
 use bizGhs\custom\classes\CustomClass;
+use common\components\dict;
 use common\components\util;
 use Yii;
 
 class ClearController extends BaseController
 {
 
+    //取消结账单 ssh 20220509
+    public function actionCancel()
+    {
+        $id = Yii::$app->request->get('id');
+        $clear = ClearClass::getLockById($id);
+        if (empty($clear)) {
+            util::fail('没有结账信息');
+        }
+        $customId = $clear->customId ?? 0;
+        $custom = CustomClass::getById($customId, true);
+        $customShopId = $custom->shopId ?? 0;
+        if ($customShopId != $this->shopId) {
+            util::fail('没有权限');
+        }
+        if ($clear->clearStyle != dict::getDict('clearStyle', 'hd2Gys')) {
+            util::fail('不是你建的账单');
+        }
+        if ($clear->status == ClearClass::STATUS_HAS_PAY) {
+            util::fail('账单已完成');
+        }
+        if ($clear->status == ClearClass::STATUS_EXPIRE) {
+            util::fail('账单已取消');
+        }
+        $clear->status = ClearClass::STATUS_EXPIRE;
+        $clear->save();
+        util::complete();
+    }
+
     //结款单 ssh 20210625
     public function actionList()
     {

app-hd/controllers/PurchaseClearController.php

@@ -30,7 +30,7 @@ class PurchaseClearController extends BaseController
                     $item->status = PurchaseClearClass::STATUS_EXPIRE;
                     $item->save();
                 } else {
-                    util::fail('已生成过账单，请稍后再试');
+                    util::success(['hasUnComplete' => 1], '还有待完成结账单');
                 }
             }
         }

biz-ghs/clear/classes/ClearClass.php

@@ -11,6 +11,7 @@ use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\shop\classes\MainClass;
 use bizHd\purchase\classes\PurchaseClass;
+use bizHd\purchase\classes\PurchaseClearClass;
 use common\components\dict;
 use common\components\orderSn;
 use common\components\util;
@@ -222,6 +223,15 @@ class ClearClass extends BaseClass
         if (empty($info)) {
             return $info;
         }
+
+        $deadline = $info['deadline'] ?? '';
+        $deadTime = strtotime($deadline);
+        $current = time();
+        if ($current >= $deadTime) {
+            $info['status'] = PurchaseClearClass::STATUS_EXPIRE;
+            self::updateById($id, ['status' => PurchaseClearClass::STATUS_EXPIRE]);
+        }
+
         $purchaseIds = $info['purchaseIds'] ?? [];
         $cgArr = explode(',', $purchaseIds);
         $cgList = PurchaseClass::getAllByCondition(['id' => ['in', $cgArr]], null, '*', null);

common/components/dict.php

@@ -111,8 +111,8 @@ class dict
 
         //结帐方式
         'clearStyle' => [
-            'hd2Gys' => 1,//零售向供应商结帐
-            'gys2Hd' => 2,//供应商给花店结帐
+            'hd2Gys' => 1,//零售主动供应商结帐
+            'gys2Hd' => 2,//供应商要求花店结帐
             'gys2KmGys' => 3,//供应商向昆明供应商结帐
             'kmGys2gys' => 4,//昆明供应商向供应商结账
         ],