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

app/models/store/StoreOrder.php

@@ -1450,7 +1450,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'] = self::statusByWhere(1, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)->where('store_id', 0)->where('shipping_type', 2)->count();
+        $data['exchange_ticket_count'] = StoreExchangeOrder::where('uid|gift_uid', $uid)->count();
         return $data;
     }