Skip to content

M
my-yaf-project
Commit 61603e65 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

parents ef5836d2 ad1f6598
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
application/models/DAO/Order/Order.php
View file @ 61603e65
...@@ -650,13 +650,16 @@ class OrderModel extends \DAO\AbstractModel ...@@ -650,13 +650,16 @@ class OrderModel extends \DAO\AbstractModel
if ($order['orderState'] == ApiConst::orderStateWaitPay && $order['paymentType'] != ApiConst::offlinePay && $order['paymentType'] != ApiConst::afterSendPay) { if ($order['orderState'] == ApiConst::orderStateWaitPay && $order['paymentType'] != ApiConst::offlinePay && $order['paymentType'] != ApiConst::afterSendPay) {
$text = OrderConst::unpayMessage; $text = OrderConst::unpayMessage;
} }
if ($order['orderState'] == ApiConst::orderStateWaitConfirm && $order['paymentType'] != ApiConst::offlinePay && $order['paymentType'] != ApiConst::afterSendPay) { if((TIMESTAMP-$order['paymentTime'])<ApiConst::tenMinSecond){
if($order['orderState']==ApiConst::orderStateClose && $order['orderState']==ApiConst::orderStateCancel){ $text = OrderConst::payCancelMessage;
$test='';
}else{
$text = OrderConst::payCancelMessage;
}
} }
// if ($order['orderState'] == ApiConst::orderStateWaitConfirm && $order['paymentType'] != ApiConst::offlinePay && $order['paymentType'] != ApiConst::afterSendPay) {
// if($order['orderState']==ApiConst::orderStateClose && $order['orderState']==ApiConst::orderStateCancel){
// $test='';
// }else{
// $text = OrderConst::payCancelMessage;
// }
// }
} }
//详情 //详情
if ($textType == ApiConst::orderDetailDescribe) { if ($textType == ApiConst::orderDetailDescribe) {
......
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