rabin 4 miesięcy temu
rodzic
commit
8b14aa1f64
2 zmienionych plików z 7 dodań i 3 usunięć
  1. 2 2
      src/place/api/Resource.php
  2. 5 1
      src/place/lib/Resource.php

+ 2 - 2
src/place/api/Resource.php

@@ -98,8 +98,8 @@ class Resource extends Main
         $data['order'][] = array('name' => '待付款', 'status' => 1);
         $data['order'][] = array('name' => '待发货', 'status' => 2);
         $data['order'][] = array('name' => '待收货', 'status' => '3,4');
-        $data['order'][] = array('name' => '已完成', 'status' => '5,6,7,8,9');
-        $data['order'][] = array('name' => '退款申请', 'status' => '10');
+        $data['order'][] = array('name' => '已完成', 'status' => '5,6,7,9');
+        $data['order'][] = array('name' => '退款', 'status' => '10');
         $data['list'] = $this->service->getOrderList();
         return Place::result($data);
     }

+ 5 - 1
src/place/lib/Resource.php

@@ -140,7 +140,11 @@ class Resource
         $status = Dever::input('status');
         if ($status) {
             if ($status == 10) {
-                $where['refund_status'] = 1;
+                $where['or'] = array
+                (
+                    'refund_status' => '1',
+                    'status' => '9',
+                );
             } else {
                 $where['status'] = array('in', $status);
             }