|
|
@@ -130,7 +130,7 @@ class StoreExchangeOrder extends BaseModel
|
|
|
|
|
|
public static function searchUserOrder($uid, $order_id)
|
|
|
{
|
|
|
- $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)->where('is_del', 0)
|
|
|
+ $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)
|
|
|
->order('add_time DESC')->select();
|
|
|
if (!$order)
|
|
|
return false;
|
|
|
@@ -141,9 +141,9 @@ class StoreExchangeOrder extends BaseModel
|
|
|
|
|
|
public static function getUserOrderList($uid, $status = '', $page = 0, $limit = 8)
|
|
|
{
|
|
|
- if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
|
|
|
+ if ($page) $list = self::statusByWhere($status, $uid)->where('uid|gift_uid', $uid)
|
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
|
- else $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
|
|
|
+ else $list = self::statusByWhere($status, $uid)->where('uid|gift_uid', $uid)
|
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
|
return $list;
|
|
|
}
|