diff --git a/app/Admin/Controllers/OrderProfitController.php b/app/Admin/Controllers/OrderProfitController.php index 2ac33798..9bf1e418 100644 --- a/app/Admin/Controllers/OrderProfitController.php +++ b/app/Admin/Controllers/OrderProfitController.php @@ -22,6 +22,8 @@ class OrderProfitController extends AdminController { return Grid::make(OrderProfit::with(['order', 'user', 'fromUser']), function (Grid $grid) { + $grid->model()->latest('created_at'); + $grid->disableViewButton(false); $grid->column('order.sn'); diff --git a/app/Services/DistributeService.php b/app/Services/DistributeService.php index 2a5cb8fe..d935dd4e 100644 --- a/app/Services/DistributeService.php +++ b/app/Services/DistributeService.php @@ -113,12 +113,10 @@ class DistributeService } // 订单确认收货 if (!$order->isCompleted()) { - logger(1); return false; } // 已经生成过返利记录 if ($order->profits()->exists()) { - logger(2); return false; } // 订单超过售后期限