xieruidong 2 years ago
parent
commit
5bac75a3d0
2 changed files with 9 additions and 1 deletions
  1. 1 1
      application/api/controller/mall/Orders.php
  2. 8 0
      application/common/model/Orders.php

+ 1 - 1
application/api/controller/mall/Orders.php

@@ -177,7 +177,7 @@ class Orders extends Api
         ]);
         $user=$this->auth->getUser();
         $order=$user->orders()->findOrFail($data['id']);
-        $order->makeCancel();
+        $order->allowCancel() && $order->makeCancel();
         $this->success();
     }
 

+ 8 - 0
application/common/model/Orders.php

@@ -150,6 +150,14 @@ class Orders extends Model
             self::S_CANCEL,
         ]);
     }
+    /**
+     * 是否允许取消
+     */
+    public function allowCancel(){
+        return in_array($this['status'],[
+            self::S_WAIT_PAY,
+        ]);
+    }