Skip to content

M
my-yaf-project
Commit 21c9200c authored by chenchuanwen's avatar chenchuanwen
Browse files
Options

updateaddOrder

parent be98b1a6
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 3 deletions
application/models/DAO/Order/Order.php
View file @ 21c9200c
......@@ -143,10 +143,10 @@ class OrderModel extends \DAO\AbstractModel
public function isAllowCancel($order)
{
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 {
if(($order['addTime']+ApiConst::tenMinSecond)<TIMESTAMP){
return false;
}else{
return true;
}
}else{
if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
......@@ -155,6 +155,20 @@ class OrderModel extends \DAO\AbstractModel
return true;
}
}
//原来的
// 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;
// }
// }else{
// if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
// return false;
// }else{
// return true;
// }
// }
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment