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