Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

This commit is contained in:
liaofei 2023-04-20 18:03:51 +08:00
commit 9f48ba4270

View File

@ -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);
}
/**