Skip to content

M
my-yaf-project
Commit a5f59567 authored by wwccw0591's avatar wwccw0591
Browse files
Options

pc

parent 0d2d3fcc
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
application/models/DAO/Order/Order.php
View file @ a5f59567
...@@ -600,9 +600,13 @@ class OrderModel extends \DAO\AbstractModel ...@@ -600,9 +600,13 @@ 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) {
if($order['orderState']==ApiConst::orderStateClose && $order['orderState']==ApiConst::orderStateCancel){
$test='';
}else{
$text = OrderConst::payCancelMessage; $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