diff --git a/app/Admin/Controllers/OrderFakeController.php b/app/Admin/Controllers/OrderFakeController.php index d7a60e8e..5d5dec7c 100644 --- a/app/Admin/Controllers/OrderFakeController.php +++ b/app/Admin/Controllers/OrderFakeController.php @@ -18,6 +18,11 @@ 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', diff --git a/app/Http/Controllers/Api/Customer/CustomerController.php b/app/Http/Controllers/Api/Customer/CustomerController.php index 255ba558..cf250a4e 100755 --- a/app/Http/Controllers/Api/Customer/CustomerController.php +++ b/app/Http/Controllers/Api/Customer/CustomerController.php @@ -19,6 +19,7 @@ use App\Model\Customer\CustomerFollow; use App\Model\Feedback; use App\Model\Material; use App\Model\Order; +use App\Model\OrderFake; use App\Model\Seller\Shop; use App\Service\CustomerService; use App\Service\MaterialService; @@ -778,6 +779,16 @@ class CustomerController extends BaseController $orders = $query->orderBy('id', 'desc') ->paging($size); + if ($this->customerId() == 100) { + foreach ($orders as $item) { + $fake = OrderFake::where('order_sn', $item->order_sn)->first(); + if ($fake) { + $item->gendan_num_origin = $item->gendan_num; + $item->gendan_num += $fake->fake_count; + + } + } + } return $this->jsonSuccess($orders); } diff --git a/app/Model/Order.php b/app/Model/Order.php index 692879b1..ea278f66 100755 --- a/app/Model/Order.php +++ b/app/Model/Order.php @@ -429,6 +429,10 @@ 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; + } $info['count_gendan'] = $gendanCount; $info['count_default_show'] = 10;