pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

dis

release
panliang 2022-06-02 14:54:48 +08:00
parent 2be899662a
commit f7a2a9c29e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/OrderProfitController.php
View File

@ -22,6 +22,8 @@ class OrderProfitController extends AdminController
{ {
return Grid::make(OrderProfit::with(['order', 'user', 'fromUser']), function (Grid $grid) { return Grid::make(OrderProfit::with(['order', 'user', 'fromUser']), function (Grid $grid) {
$grid->model()->latest('created_at');
$grid->disableViewButton(false); $grid->disableViewButton(false);
$grid->column('order.sn'); $grid->column('order.sn');

2
app/Services/DistributeService.php
View File

@ -113,12 +113,10 @@ class DistributeService
} }
// 订单确认收货 // 订单确认收货
if (!$order->isCompleted()) { if (!$order->isCompleted()) {
logger(1);
return false; return false;
} }
// 已经生成过返利记录 // 已经生成过返利记录
if ($order->profits()->exists()) { if ($order->profits()->exists()) {
logger(2);
return false; return false;
} }
// 订单超过售后期限 // 订单超过售后期限