Browse Source

一些功能

Kirin 3 years ago
parent
commit
65eb3c329b
2 changed files with 4 additions and 2 deletions
  1. 3 1
      app/models/store/StoreExchangeOrder.php
  2. 1 1
      app/models/store/StoreOrder.php

+ 3 - 1
app/models/store/StoreExchangeOrder.php

@@ -148,7 +148,7 @@ class StoreExchangeOrder extends BaseModel
     public static function searchUserOrder($uid, $order_id)
     {
         $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)
-            ->order('add_time DESC')->select();
+            ->order('id DESC')->select();
         if (!$order)
             return false;
         else
@@ -180,6 +180,8 @@ class StoreExchangeOrder extends BaseModel
             return $model->where('refund_status', 2);
         else if ($status == -3)//退款
             return $model->where('refund_status', 'IN', '1,2');
+        else if ($status == 9)//已送出
+            return $model->where('uid', $uid)->where('gift_uid', '>', 0)->where('gift_uid', '<>', $uid);
         else
             return $model;
     }

+ 1 - 1
app/models/store/StoreOrder.php

@@ -1482,7 +1482,7 @@ class StoreOrder extends BaseModel
         $data['complete_count'] = self::statusByWhere(4, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)->count();
         //订单退款
         $data['refund_count'] = self::statusByWhere(-1, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)->count();
-        $data['exchange_ticket_count'] = StoreExchangeOrder::where('uid|gift_uid', $uid)->count();
+        $data['exchange_ticket_count'] = StoreExchangeOrder::where('uid|gift_uid', $uid)->where('refund_status', 0)->where('status', 0)->count();
         return $data;
     }