Skip to content

M
my-yaf-project
Commit 18c69bb3 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

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

parents 29e4c3bd 971097f6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
application/models/DAO/Order/Order.php
View file @ 18c69bb3
...@@ -600,7 +600,11 @@ class OrderModel extends \DAO\AbstractModel ...@@ -600,7 +600,11 @@ class OrderModel extends \DAO\AbstractModel
$text = OrderConst::unpayMessage; $text = OrderConst::unpayMessage;
} }
if ($order['orderState'] == ApiConst::orderStateWaitConfirm && $order['paymentType'] != ApiConst::offlinePay && $order['paymentType'] != ApiConst::afterSendPay) { if ($order['orderState'] == ApiConst::orderStateWaitConfirm && $order['paymentType'] != ApiConst::offlinePay && $order['paymentType'] != ApiConst::afterSendPay) {
$text = OrderConst::payCancelMessage; if($order['orderState']==ApiConst::orderStateClose && $order['orderState']==ApiConst::orderStateCancel){
$test='';
}else{
$text = OrderConst::payCancelMessage;
}
} }
} }
//详情 //详情
......
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