|
@@ -1399,7 +1399,7 @@ class OrderService extends BaseService
|
|
|
$limitNum = $limitNum > 10 && $limitNum < 2000 ? $limitNum : 300;
|
|
$limitNum = $limitNum > 10 && $limitNum < 2000 ? $limitNum : 300;
|
|
|
$datas = $this->model->from('orders as a')
|
|
$datas = $this->model->from('orders as a')
|
|
|
->leftJoin('orders_commissions as b','b.order_id','=','a.id')
|
|
->leftJoin('orders_commissions as b','b.order_id','=','a.id')
|
|
|
- ->where(['a.status' => 2, 'b.status'=>2, 'a.mark' => 1])
|
|
|
|
|
|
|
+ ->where(['a.status' => 2,'a.refund_status'=>0, 'b.status'=>2, 'a.mark' => 1])
|
|
|
->select(['a.id', 'a.user_id', 'a.order_no', 'a.status'])
|
|
->select(['a.id', 'a.user_id', 'a.order_no', 'a.status'])
|
|
|
->limit($limitNum)
|
|
->limit($limitNum)
|
|
|
->get();
|
|
->get();
|
