Browse Source

订单保存地接guide_id

dev
李可松 5 years ago
parent
commit
4145ac6ba8
  1. 6
      MySQL_change.sql
  2. 5
      app/AdminGuide/Controllers/OrderController.php
  3. 1
      app/Http/Controllers/Api/OrderController.php

6
MySQL_change.sql

@ -52,3 +52,9 @@ ALTER TABLE `agent_products`
ALTER TABLE `advertisings`
CHANGE COLUMN `agent_id` `agent_id` INT(10) NOT NULL COMMENT '发布者ID' AFTER `id`,
ADD INDEX `agent_id` (`agent_id`);
# 0:01 ‎2021/‎08/‎20
ALTER TABLE `orders`
ADD COLUMN `guide_id` INT NOT NULL DEFAULT '0' COMMENT '地接ID' AFTER `refund_info`,
ADD INDEX `guide_id` (`guide_id`);

5
app/AdminGuide/Controllers/OrderController.php

@ -7,6 +7,7 @@ use App\Common\OrderStatus;
use App\Common\PayType;
use App\Models\Agent;
use App\Models\Supplier;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
@ -26,7 +27,7 @@ class OrderController extends AdminController
$grid->disableCreateButton();
$grid->disableActions();
//TODO 此处需要再加筛选条件
$grid->model()->where('guide_id', Admin::user()->id);
$grid->column('id')->sortable();
$grid->column('agent.name');
@ -46,6 +47,8 @@ class OrderController extends AdminController
$grid->filter(function (Grid\Filter $filter) {
$filter->panel();
$filter->model()->where('guide_id', Admin::user()->id);
$filter->equal('id')->width(2);
$filter->equal('mobile')->width(2);
$filter->equal('order_no')->width(3);

1
app/Http/Controllers/Api/OrderController.php

@ -151,6 +151,7 @@ class OrderController extends Controller
'status' => $formData['pay_type'] == PayType::OFFLINE ? Status::OFFLINE_UNPAID : Status::UNPAID,
'pay_type' => $formData['pay_type'],
'coupon_id' => join(',', $coupon_ids),
'guide_id' => $ap->guide_id,
]);
DB::commit();

Loading…
Cancel
Save