mirror of
https://github.com/crmeb/CRMEB.git
synced 2026-10-29 05:50:50 +00:00
Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev
This commit is contained in:
commit
9f48ba4270
@ -67,7 +67,15 @@ class Order extends AuthController
|
||||
if (!$services->count(['to_uid' => $uid])) {
|
||||
return app('json')->fail(410092);
|
||||
}
|
||||
return app('json')->success($this->services->getOrderApiList($where));
|
||||
if ($where['status'] == -1) {
|
||||
unset($where['status']);
|
||||
$where['is_cancel'] = 0;
|
||||
$refundServices = app()->make(StoreOrderRefundServices::class);
|
||||
$data = $refundServices->refundList($where)['list'];
|
||||
} else {
|
||||
$data = $this->services->getOrderApiList($where);
|
||||
}
|
||||
return app('json')->success($data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user