订单状态

addons/unishop/controller/Order.php

@@ -855,6 +855,7 @@ class Order extends Base
             if ($order) {
                 $order = $order->append(['state', 'paidtime', 'deliveredtime', 'receivedtime', 'commentedtime', 'pay_type_text', 'refund_status_text'])->toArray();
 
+                $order['state_text'] = $orderModel->getStatetextAttr($order['state'],$order['refund_status']);//状态中文
                 // 快递单号
                 /*$order['express_number'] = $order['extend']['express_number'];
                 $order['express_company'] = '快递单号';

addons/unishop/model/Order.php

@@ -197,13 +197,16 @@ class Order extends Model
     }
 
     //获取当前的订单状态，中文
-    public function getStatetextAttr($state){
+    public function getStatetextAttr($state,$refund_status){
         $data = [
             1 => '待付款',
             3 => '待核销',
             4 => '已完成',
             20 => '已取消',
         ];
+        if($state == 20 && $refund_status == 3){
+            return '已退订';
+        }
         return isset($data[$state]) ? $data[$state] : $state;
     }
 
@@ -344,7 +347,7 @@ class Order extends Model
     {
         $condition['user_id'] = ['=', $userId];
         switch ($state) {
-            case self::TYPE_PAY:
+            case self::TYPE_PAY:                                               //1=待付款
                 $condition['have_paid'] = ['=', self::PAID_NO];
                 $condition['status'] = ['=', self::STATUS_NORMAL];
                 $orderBy = 'createtime';
@@ -355,14 +358,14 @@ class Order extends Model
                 $condition['status'] = ['=', self::STATUS_NORMAL];
                 $orderBy = 'have_paid';
                 break;*/
-            case self::TYPE_RECEIVE:
+            case self::TYPE_RECEIVE:                                              //3=待核销
                 $condition['have_paid'] = ['>', self::PAID_NO];
                 $condition['have_delivered'] = ['>', self::DELIVERED_NO];
                 $condition['have_received'] = ['=', self::RECEIVED_NO];
                 $condition['status'] = ['=', self::STATUS_NORMAL];
                 $orderBy = 'have_delivered';
                 break;
-            case self::TYPE_COMMENT:
+            case self::TYPE_COMMENT:                                                 //4=已完成
                 $condition['have_paid'] = ['>', self::PAID_NO];
                 $condition['have_delivered'] = ['>', self::DELIVERED_NO];
                 $condition['have_received'] = ['>', self::RECEIVED_NO];
@@ -376,7 +379,7 @@ class Order extends Model
                 $condition['refund_status'] = ['<>', self::REFUND_STATUS_AGREE];
                 $orderBy = 'createtime';
                 break;*/
-            case self::TYPE_CANCEL:
+            case self::TYPE_CANCEL:                                              //20=已取消
 //                $condition['have_paid'] = ['>', self::PAID_NO];
                 $condition['status'] = ['=', self::STATUS_CANCEL];
                 $orderBy = 'createtime';
@@ -408,7 +411,7 @@ class Order extends Model
 
         foreach ($result as &$item) {
             $item->append(['order_id','state', 'refund_status_text']);
-            $item['state_text'] = $this->getStatetextAttr($item['state']);//状态中文
+            $item['state_text'] = $this->getStatetextAttr($item['state'],$item['refund_status']);//状态中文
             $item = $item->toArray();
 
             unset($item['pay_out_trade_no']);