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

application/models/DAO/Order/Order.php

@@ -600,9 +600,13 @@ class OrderModel extends \DAO\AbstractModel
                 $text = OrderConst::unpayMessage;
             }
             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) {
             //在未付款并且(不是线下支付或者到货付款的情况下提示此消息