diff --git a/app/Admin/Controllers/OrderFakeController.php b/app/Admin/Controllers/OrderFakeController.php index 5d5dec7c..e717dc4c 100644 --- a/app/Admin/Controllers/OrderFakeController.php +++ b/app/Admin/Controllers/OrderFakeController.php @@ -9,6 +9,7 @@ use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Http\Controllers\AdminController; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; class OrderFakeController extends AdminController { @@ -18,11 +19,6 @@ class OrderFakeController extends AdminController protected function grid() { - $orders = OrderFake::paging(1); - foreach ($orders as $item) { - $item->fake_count += 100; - } - dd($orders->toArray()); return Grid::make(OrderFake::class, function (Grid $grid) { $grid->model()->with([ 'customer:id,name,nickname,phone', @@ -58,7 +54,9 @@ class OrderFakeController extends AdminController }); }, '发单人名称'); }); - + $grid->disableEditButton(); + $grid->disableDeleteButton(); + $grid->disableActions(); $grid->disableViewButton(); $grid->scrollbarX(); }); @@ -174,6 +172,9 @@ JS $form->created_by = Admin::user()->id; } }); + $form->saved(function (Form $form) { + Order::where('order_sn', $form->order_sn)->increment('gendan_num', $form->fake_count); + }); $form->footer(function ($footer) { $footer->disableViewCheck(); diff --git a/app/Model/Order.php b/app/Model/Order.php index ea278f66..533f294a 100755 --- a/app/Model/Order.php +++ b/app/Model/Order.php @@ -429,9 +429,11 @@ class Order extends BaseModel ->where('pay_state', PayState::SUCCESS) ->whereIn('lottery_state', $this->gendanLotteryState()) ->count(); - $fake = OrderFake::where('order_sn', $this->order_sn)->first(); - if ($fake) { - $gendanCount += $fake->fake_count; + if ($this->created_date <= '20260704') { + $fake = OrderFake::where('order_sn', $this->order_sn)->first(); + if ($fake) { + $gendanCount += $fake->fake_count; + } } $info['count_gendan'] = $gendanCount; $info['count_default_show'] = 10;