pc

application/models/DAO/Order/Order.php

@@ -133,14 +133,20 @@ class OrderModel extends \DAO\AbstractModel
     //判断订单是否允许取消
     public function isAllowCancel($order)
     {
-        if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
-            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP && $order['paymentTime']>ApiConst::zero ){
+        if($order['paymentTime']==ApiConst::zero){
+            if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
+                return true;
+            } else {
                 return false;
             }
-            return true;
-        } else {
-            return false;
+        }else{
+            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
+                return false;
+            }else{
+                return true;
+            }
         }
+
     }
 
     //列表转换