Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

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
@@ -159,9 +159,9 @@ class StoreExchangeOrder extends BaseModel
     public static function getUserOrderList($uid, $status = '', $page = 0, $limit = 8)
     {
         if ($page) $list = self::statusByWhere($status, $uid)->where('uid|gift_uid', $uid)
-            ->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
+            ->order('id DESC')->page((int)$page, (int)$limit)->select()->toArray();
         else  $list = self::statusByWhere($status, $uid)->where('uid|gift_uid', $uid)
-            ->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
+            ->order('id DESC')->page((int)$page, (int)$limit)->select()->toArray();
         return $list;
     }
 
@@ -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;
     }

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;
     }