pc

a5f59567 · wwccw0591 · 0d2d3fcc · a5f59567
Commit a5f59567 authored Sep 06, 2018 by wwccw0591
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Order.php application/models/DAO/Order/Order.php +5 -1

No files found.
--- a/application/models/DAO/Order/Order.php
+++ b/application/models/DAO/Order/Order.php
@@ -600,7 +600,11 @@ class OrderModel extends \DAO\AbstractModel
                $text = OrderConst::unpayMessage;
            }
            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;
+                }
            }
        }
        //详情