From 28061633ce2e8f7f84a3c291510f8c2b9639663e Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Wed, 2 Sep 2020 16:38:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/ModifyOrderState.php        |  58 ++++++++
 app/Admin/Actions/Show/OrderDetail.php        |  78 ++++++++++
 .../ImsCjdcOrderMainController.php            | 139 ++++++++++++++++++
 app/Admin/Controllers/Test.php                |  18 +++
 app/Admin/Extensions/CheckRow.php             |  61 +++++---
 app/Admin/Extensions/OrderDetail.php          |  16 ++
 app/Admin/Extensions/OrderStateHandle.php     |  55 +++++++
 app/Admin/Repositories/ImsCjdcMarket.php      |   6 +
 app/Admin/Repositories/ImsCjdcOrderMain.php   |   5 +-
 app/Admin/routes.php                          |   3 +
 app/Models/ImsCjdcMarket.php                  |  14 +-
 app/Models/ImsCjdcOrderMain.php               |   2 +
 app/Models/StoreAccount.php                   |   5 -
 config/order.php                              |  48 ++++++
 resources/lang/zh-CN/ims-cjdc-order-main.php  |  16 ++
 resources/views/orderdetail.php               |  14 ++
 16 files changed, 496 insertions(+), 42 deletions(-)
 create mode 100644 app/Admin/Actions/ModifyOrderState.php
 create mode 100644 app/Admin/Actions/Show/OrderDetail.php
 create mode 100644 app/Admin/Controllers/ImsCjdcOrderMainController.php
 create mode 100644 app/Admin/Controllers/Test.php
 create mode 100644 app/Admin/Extensions/OrderDetail.php
 create mode 100644 app/Admin/Extensions/OrderStateHandle.php
 create mode 100644 config/order.php
 create mode 100644 resources/lang/zh-CN/ims-cjdc-order-main.php
 create mode 100644 resources/views/orderdetail.php

diff --git a/app/Admin/Actions/ModifyOrderState.php b/app/Admin/Actions/ModifyOrderState.php
new file mode 100644
index 0000000..4cc0f48
--- /dev/null
+++ b/app/Admin/Actions/ModifyOrderState.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Admin\Actions;
+
+use Dcat\Admin\Actions\Action;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Traits\HasPermissions;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+
+class ModifyOrderState extends Action
+{
+    /**
+     * @return string
+     */
+	protected $title = '状态';
+
+    /**
+     * Handle the action request.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function handle(Request $request)
+    {
+        // dump($this->getKey());
+
+        return $this->response()->success('Processed successfully.')->redirect('/');
+    }
+
+    /**
+     * @return string|array|void
+     */
+    public function confirm()
+    {
+        // return ['Confirm?', 'contents'];
+    }
+
+    /**
+     * @param Model|Authenticatable|HasPermissions|null $user
+     *
+     * @return bool
+     */
+    protected function authorize($user): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    protected function parameters()
+    {
+        return [];
+    }
+}
diff --git a/app/Admin/Actions/Show/OrderDetail.php b/app/Admin/Actions/Show/OrderDetail.php
new file mode 100644
index 0000000..318f14a
--- /dev/null
+++ b/app/Admin/Actions/Show/OrderDetail.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Admin\Actions\Show;
+
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Show\AbstractTool;
+use Dcat\Admin\Traits\HasPermissions;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+
+class OrderDetail extends AbstractTool
+{
+    /**
+     * @return string
+     */
+	protected $title = '订单订单详情';
+
+    /**
+     * Handle the action request.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function handle(Request $request)
+    {
+    	 dd($this->getKey());
+
+        return $this->response()
+            ->success('Processed successfully.')
+            ->redirect('/');
+    }
+
+    /**
+     * @return string|void
+     */
+    protected function href()
+    {
+         return admin_url('auth/users');
+    }
+
+    /**
+	 * @return string|array|void
+	 */
+	public function confirm()
+	{
+		 return ['Confirm?', 'contents'];
+	}
+
+    /**
+     * @param Model|Authenticatable|HasPermissions|null $user
+     *
+     * @return bool
+     */
+    protected function authorize($user): bool
+    {
+        return true;
+    }
+
+    // 如果你想自定义动作按钮的HTML，可以重写此方法
+    public function html()
+    {
+
+        return view('orderdetail');
+
+
+    }
+
+
+    /**
+     * @return array
+     */
+    protected function parameters()
+    {
+        return [];
+    }
+}
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
new file mode 100644
index 0000000..b8d4ecc
--- /dev/null
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Extensions\OrderDetail;
+use App\Admin\Extensions\OrderStateHandle;
+use App\Admin\Repositories\ImsCjdcOrderMain;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;;
+
+class ImsCjdcOrderMainController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new ImsCjdcOrderMain(), function (Grid $grid) {
+            //>>1.只展示线上订单打√
+            //>>2.不同服务站只能看到自己的市场订单
+            //>>3.订单不允许有添加,编辑,删除
+            //>>4.订单状态变更√
+            //>>5.打印功能
+            //>6.退款
+            $grid->paginate(10);//每页展示数据10条
+            //$grid->id;
+            //$grid->user_id('用户信息');
+            $grid->column('user_name','用户信息');
+            $grid->order_num;
+
+            $grid->state('订单状态')
+                ->using(config('order.state'))
+                ->label([1=>'dark',2=>'danger',3=>'indigo',4=>'success']);
+            $grid->money;
+            $grid->column('market.name','所属市场');
+            $grid->time;
+            $grid->pay_time;
+            $grid->actions(function (Grid\Displayers\Actions $actions) {
+                $state = $actions->row->state;
+                if ($state==2){
+                    $actions->append(new OrderStateHandle('接单',3));
+                }elseif ($state==31){
+                    $actions->append(new OrderStateHandle('完成',4));
+                }
+                $actions->append(new OrderDetail('详情'));
+
+                //$actions->append("<a class='btn btn-xs action-btn btn-danger grid-row-refuse' data-id='{$actions->getKey()}'><i class='fa fa-close' title='拒绝退款'>拒绝</i></a>&nbsp;&nbsp;");
+                //$actions->append("<a class='btn btn-xs action-btn btn-success grid-row-pass' data-id='{$actions->getKey()}'><i class='fa fa-check' title='同意退款'>同意</i></a>");
+
+
+            });
+            //$grid->column('详情')->modal('详情',function ()use ($grid){
+            //     return view('orderdetail',['id'=>2]);
+            //
+            //});
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+
+            });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new ImsCjdcOrderMain(), function (Show $show) {
+            $show->id;
+            $show->user_id;
+            $show->order_num;
+            $show->state;
+            $show->time;
+            $show->pay_time;
+            $show->money;
+            $show->tools(function (Show\Tools $tools) {
+                $tools->append(new \App\Admin\Actions\Show\OrderDetail());
+            });
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new ImsCjdcOrderMain(), function (Form $form) {
+            $form->display('id');
+            $form->text('user_id');
+            $form->text('order_num');
+            $form->text('state');
+            $form->text('time');
+            $form->text('pay_time');
+            $form->text('money');
+        });
+    }
+
+
+    public function orderDetail()
+    {
+        echo 111;
+    }
+}
diff --git a/app/Admin/Controllers/Test.php b/app/Admin/Controllers/Test.php
new file mode 100644
index 0000000..7ef955c
--- /dev/null
+++ b/app/Admin/Controllers/Test.php
@@ -0,0 +1,18 @@
+<?php
+
+
+namespace App\Admin\Controllers;
+
+
+use App\Admin\Repositories\ImsCjdcMarket;
+use Dcat\Admin\Controllers\AdminController;
+use Dcat\Admin\Grid;
+
+class Test extends AdminController
+{
+    public function test()
+    {
+        $gird = new Grid(new \App\Models\ImsCjdcMarket());
+
+    }
+}
diff --git a/app/Admin/Extensions/CheckRow.php b/app/Admin/Extensions/CheckRow.php
index df1acd4..eb43473 100644
--- a/app/Admin/Extensions/CheckRow.php
+++ b/app/Admin/Extensions/CheckRow.php
@@ -1,42 +1,59 @@
 <?php
 namespace App\Admin\Extensions;
 
+use App\Models\ImsCjdcOrderMain;
+use App\Models\StoreAccount;
 use Dcat\Admin\Grid\RowAction;
+use Illuminate\Http\Request;
 
 class CheckRow extends RowAction
 {
 
-    public function title()
+    protected $model;
+    protected $state;
+    protected $title;
+    public function __construct($title=null,$state=null)
     {
-        return 'Check row';
+
+        parent::__construct($title);
+        $this->state = $state;
+
     }
+
+
     /**
-     * 添加JS
+     * 处理请求
      *
-     * @return string
+     * @param Request $request
+     *
+     * @return \Dcat\Admin\Actions\Response
      */
-    protected function script()
+    public function handle(Request $request)
     {
-        return <<<JS
-$('.grid-check-row').on('click', function () {
-
-    // Your code.
-    console.log($(this).data('id'));
-
-});
-JS;
-    }
-    public function html()
-    {
-        // 获取当前行数据ID
+        // 获取当前行ID
         $id = $this->getKey();
+        $orderMain = new ImsCjdcOrderMain();
+        $state = $request->get('state');
+        $res = $orderMain->modifyState($id,$state);
+        if ($res==true){
+            return $this->response()->success('操作成功')->refresh();
+        }else{
+            return $this->response()->error('操作失败');
+        }
+
 
-        // 获取当前行数据的用户名
-        $username = $this->row->username;
 
-        // 这里需要添加一个class, 和上面script方法对应
-        $this->setHtmlAttribute(['data-id' => $id, 'email' => $username, 'class' => 'grid-check-row']);
+    }
 
-        return parent::html();
+    /**
+     * 设置要POST到接口的数据
+     *
+     * @return array
+     */
+    public function parameters()
+    {
+        return [
+            'state' => $this->state,
+        ];
     }
 }
diff --git a/app/Admin/Extensions/OrderDetail.php b/app/Admin/Extensions/OrderDetail.php
new file mode 100644
index 0000000..7ae0e87
--- /dev/null
+++ b/app/Admin/Extensions/OrderDetail.php
@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Admin\Extensions;
+
+
+use Dcat\Admin\Grid\RowAction;
+
+class OrderDetail extends RowAction
+{
+    public function __construct($title=null)
+    {
+        parent::__construct($title);
+
+    }
+}
diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php
new file mode 100644
index 0000000..3615407
--- /dev/null
+++ b/app/Admin/Extensions/OrderStateHandle.php
@@ -0,0 +1,55 @@
+<?php
+namespace App\Admin\Extensions;
+
+use App\Models\ImsCjdcOrderMain;
+use Dcat\Admin\Grid\RowAction;
+use Illuminate\Http\Request;
+
+class OrderStateHandle extends RowAction
+{
+
+    protected $model;
+    protected $state;
+    protected $title;
+    public function __construct($title=null,$state=null)
+    {
+
+        parent::__construct($title);
+        $this->state = $state;
+
+    }
+
+
+    /**
+     * 处理请求
+     *
+     * @param Request $request
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(Request $request)
+    {
+        // 获取当前行ID
+        $id = $this->getKey();
+        $orderMain = new ImsCjdcOrderMain();
+        $state = $request->get('state');
+        $res = $orderMain->modifyState($id,$state);
+        if ($res==true){
+            return $this->response()->success('操作成功')->refresh();
+        }else{
+            return $this->response()->error('操作失败');
+        }
+    }
+
+    /**
+     * 设置要POST到接口的数据
+     *
+     * @return array
+     */
+    public function parameters()
+    {
+        return [
+            'state' => $this->state,
+        ];
+    }
+}
diff --git a/app/Admin/Repositories/ImsCjdcMarket.php b/app/Admin/Repositories/ImsCjdcMarket.php
index 09e1e92..d498e9e 100644
--- a/app/Admin/Repositories/ImsCjdcMarket.php
+++ b/app/Admin/Repositories/ImsCjdcMarket.php
@@ -13,4 +13,10 @@ class ImsCjdcMarket extends EloquentRepository
      * @var string
      */
     protected $eloquentClass = Model::class;
+
+    // 通过这个方法可以指定查询的字段，默认"*"
+    public function getGridColumns()
+    {
+        return [$this->getKeyName(), 'name'];
+    }
 }
diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php
index c09e322..97349dc 100644
--- a/app/Admin/Repositories/ImsCjdcOrderMain.php
+++ b/app/Admin/Repositories/ImsCjdcOrderMain.php
@@ -18,9 +18,9 @@ class ImsCjdcOrderMain extends EloquentRepository
     public function get(Grid\Model $model)
     {
         $builder = new \App\Models\ImsCjdcOrderMain();
-        $builder = $builder::leftJoin('ims_cjdc_user','ims_cjdc_user.id','ims_cjdc_order_main.user_id')
+        $builder = $builder::leftJoin('ims_cjdc_user as u','u.id','ims_cjdc_order_main.user_id')
             ->with('market')
-            ->select('ims_cjdc_order_main.*','ims_cjdc_user.name as user_name')
+            ->select('ims_cjdc_order_main.*','u.name as user_name')
             ->where('type',1)
             ->orderBy('ims_cjdc_order_main.id','desc');//只取线上订单数据
 
@@ -38,6 +38,7 @@ class ImsCjdcOrderMain extends EloquentRepository
         });
 
         $query = $query->toArray();
+        //如果订单状态为配送中 将state设置为31
         foreach ($query['data'] as &$value){
             if ($value['state']==3&&$value['order_shipping_code']==1){
                 $value['state'] = 31;
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index a6102e8..4b9dbcf 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -44,5 +44,8 @@ Route::group([
     //统计店铺新增用户
     $router->resource('/storeUserReport', 'StoreUserReportController');
 
+    $router->resource('/order', 'ImsCjdcOrderMainController');
+    $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail');
+
     $router->any('/test', 'Test@test');
 });
diff --git a/app/Models/ImsCjdcMarket.php b/app/Models/ImsCjdcMarket.php
index 8f441d5..1496a8c 100644
--- a/app/Models/ImsCjdcMarket.php
+++ b/app/Models/ImsCjdcMarket.php
@@ -29,18 +29,6 @@ class ImsCjdcMarket extends Model
         return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id');
     }
 
-    /**
-     * 获取市场信息
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public static function getMarket()
-    {
-        $markets = self::get();
-        $item         = [];
-        foreach ($markets as $market) {
-            $item[$market->id]   = $market->name;
-        }
-        return $item;
-    }
+
 
 }
diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php
index e9f4d63..76ad925 100644
--- a/app/Models/ImsCjdcOrderMain.php
+++ b/app/Models/ImsCjdcOrderMain.php
@@ -54,4 +54,6 @@ class ImsCjdcOrderMain extends Model
         });
 
     }
+
+
 }
diff --git a/app/Models/StoreAccount.php b/app/Models/StoreAccount.php
index 23de9ae..029559b 100644
--- a/app/Models/StoreAccount.php
+++ b/app/Models/StoreAccount.php
@@ -9,7 +9,6 @@ namespace App\Models;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
-use App\Models\ImsCjdcStore as storeModel;
 
 class StoreAccount extends Model
 {
@@ -46,8 +45,4 @@ class StoreAccount extends Model
             return false;
         }
     }
-
-    public function store(){
-        return $this->hasMany(storeModel::class,'id','store_id');
-    }
 }
diff --git a/config/order.php b/config/order.php
new file mode 100644
index 0000000..23caf29
--- /dev/null
+++ b/config/order.php
@@ -0,0 +1,48 @@
+<?php
+return [
+    //自营平台订单状态
+    'state'=>[
+        0=>'错误状态',
+        1=>'待付款',
+        2=>'待接单',
+        3=>'待发货',
+        31=>'配送中',//state==3&&order_shipping_code==1
+        4=>'已完成',
+        5=>'已评价',
+        6=>'已取消',
+        7=>'拒绝',
+        8=>'申请退款',
+        9=>'已退款',
+        10=>'退款拒绝',
+        9999=>'虚拟订单'
+    ],
+    //达达平台的订单状态
+    'dada_status'=>[
+        1=>'待快递员接单',
+        2=>'待取货',
+        3=>'配送中',
+        4=>'已完成',
+        5=>'已取消',
+        8=>'指派单',
+        9=>'妥投异常之物品返回中',
+        10=>'妥投异常之物品返回完成',
+        100=>'骑士到店',
+        1000=>'创建达达运单失败',
+
+    ],
+    //达达测试0 如果为1则用为正式环境
+    'online'=>0,
+    'dada_test_config'=>[
+        'source_id'=>'73753',
+        'shop_no'=>'11047059',
+        'app_key'=>'dada91f5568c2fa580b',
+        'app_secret'=>'851019e075fd94d00942289c9161008c',
+        'url'=>'http://newopen.qa.imdada.cn'
+    ],
+    'dada_config'=>[
+        'source_id'=>'49325',
+        'app_key'=>'dada9c5cebc86361427',
+        'app_secret'=>'bd3cedf12d2749aa8791f1686a9d9a54',
+        'url'=>'https://newopen.imdada.cn'
+    ],
+];
diff --git a/resources/lang/zh-CN/ims-cjdc-order-main.php b/resources/lang/zh-CN/ims-cjdc-order-main.php
new file mode 100644
index 0000000..3600905
--- /dev/null
+++ b/resources/lang/zh-CN/ims-cjdc-order-main.php
@@ -0,0 +1,16 @@
+<?php 
+return [
+    'labels' => [
+        'ImsCjdcOrderMain' => 'ImsCjdcOrderMain',
+    ],
+    'fields' => [
+        'user_id' => '用户id',
+        'order_num' => '订单号',
+        'state' => '1.待付款2.待结单3.等待送达4.完成5.已评价6.取消7.拒绝8.退款中9.已退款10.退款拒绝',
+        'time' => '下单时间',
+        'pay_time' => '支付时间',
+        'money' => '付款金额',
+    ],
+    'options' => [
+    ],
+];
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
new file mode 100644
index 0000000..ec2878a
--- /dev/null
+++ b/resources/views/orderdetail.php
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<head>
+    <meta charset="utf-8">
+    <title>Laravel</title>
+
+
+
+</head>
+<body >
+
+   <h1>{{$id}}</h1>
+</body>
+</html>

From b468729be00050180c58f76ee85c668dd635500c Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Wed, 2 Sep 2020 17:00:44 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=91=E6=89=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LanzuServiceHorsemanController.php        |  79 ++++++
 .../Repositories/LanzuServiceHorseman.php     |  16 ++
 app/Admin/routes.php                          |   2 +
 app/Models/LanzuServiceHorseman.php           |  16 ++
 dcat_admin_ide_helper.php                     | 236 ++++++++++++------
 .../lang/zh-CN/lanzu-service-horseman.php     |  17 ++
 6 files changed, 294 insertions(+), 72 deletions(-)
 create mode 100644 app/Admin/Controllers/LanzuServiceHorsemanController.php
 create mode 100644 app/Admin/Repositories/LanzuServiceHorseman.php
 create mode 100644 app/Models/LanzuServiceHorseman.php
 create mode 100644 resources/lang/zh-CN/lanzu-service-horseman.php

diff --git a/app/Admin/Controllers/LanzuServiceHorsemanController.php b/app/Admin/Controllers/LanzuServiceHorsemanController.php
new file mode 100644
index 0000000..4a5e39b
--- /dev/null
+++ b/app/Admin/Controllers/LanzuServiceHorsemanController.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\LanzuServiceHorseman;
+use App\Models\ImsCjdcMarket;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+
+class LanzuServiceHorsemanController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new LanzuServiceHorseman(), function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->name;
+            $grid->tel;
+            $grid->market_id('所属市场');
+            $grid->status('状态');
+            $grid->head_url;
+            $grid->created_at;
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new LanzuServiceHorseman(), function (Show $show) {
+            $show->id;
+            $show->user_id;
+            $show->name;
+            $show->tel;
+            $show->market_id;
+            $show->status;
+            $show->qr_url;
+            $show->head_url;
+            $show->created_at;
+            $show->updated_at;
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new LanzuServiceHorseman(), function (Form $form) {
+            $form->display('id');
+            $form->text('user_id','懒ID')->required();
+            $form->text('name')->required();
+            $form->mobile('tel')->required();
+            $form->text('market_id','所属市场')->options(ImsCjdcMarket::getMarket())->required();
+            $form->radio('status','状态')->options([1=>'启用',-1=>'禁用'])->value(1)->required();
+            $form->image('head_url')->uniqueName();
+
+            $form->display('created_at');
+            $form->display('updated_at');
+        });
+    }
+}
diff --git a/app/Admin/Repositories/LanzuServiceHorseman.php b/app/Admin/Repositories/LanzuServiceHorseman.php
new file mode 100644
index 0000000..56a449f
--- /dev/null
+++ b/app/Admin/Repositories/LanzuServiceHorseman.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\LanzuServiceHorseman as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class LanzuServiceHorseman extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 4b9dbcf..44bf16d 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -47,5 +47,7 @@ Route::group([
     $router->resource('/order', 'ImsCjdcOrderMainController');
     $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail');
 
+    $router->resource('/horseman', 'LanzuServiceHorsemanController');
+
     $router->any('/test', 'Test@test');
 });
diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php
new file mode 100644
index 0000000..74ad9f0
--- /dev/null
+++ b/app/Models/LanzuServiceHorseman.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuServiceHorseman extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'lanzu_service_horseman';
+    
+}
diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php
index b196c5b..d517b36 100644
--- a/dcat_admin_ide_helper.php
+++ b/dcat_admin_ide_helper.php
@@ -69,14 +69,26 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection mm_id
      * @property Grid\Column|Collection admin_user_id
      * @property Grid\Column|Collection cs_id
+     * @property Grid\Column|Collection type
+     * @property Grid\Column|Collection user_id
+     * @property Grid\Column|Collection desc
      * @property Grid\Column|Collection activity
      * @property Grid\Column|Collection forward
      * @property Grid\Column|Collection repay
+     * @property Grid\Column|Collection category
+     * @property Grid\Column|Collection value
+     * @property Grid\Column|Collection store_id
+     * @property Grid\Column|Collection store_name
+     * @property Grid\Column|Collection new_user_total
+     * @property Grid\Column|Collection mm_user_id
+     * @property Grid\Column|Collection order_num
+     * @property Grid\Column|Collection state
+     * @property Grid\Column|Collection time
+     * @property Grid\Column|Collection pay_time
      * @property Grid\Column|Collection parent_id
      * @property Grid\Column|Collection order
      * @property Grid\Column|Collection icon
      * @property Grid\Column|Collection uri
-     * @property Grid\Column|Collection user_id
      * @property Grid\Column|Collection permission_id
      * @property Grid\Column|Collection menu_id
      * @property Grid\Column|Collection http_method
@@ -122,7 +134,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection rules
      * @property Grid\Column|Collection uid
      * @property Grid\Column|Collection group_id
-     * @property Grid\Column|Collection type
      * @property Grid\Column|Collection condition
      * @property Grid\Column|Collection ismenu
      * @property Grid\Column|Collection weigh
@@ -135,7 +146,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection executetime
      * @property Grid\Column|Collection group
      * @property Grid\Column|Collection tip
-     * @property Grid\Column|Collection value
      * @property Grid\Column|Collection rule
      * @property Grid\Column|Collection extend
      * @property Grid\Column|Collection event
@@ -158,7 +168,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection refreshtime
      * @property Grid\Column|Collection deletetime
      * @property Grid\Column|Collection switch
-     * @property Grid\Column|Collection state
      * @property Grid\Column|Collection gender
      * @property Grid\Column|Collection birthday
      * @property Grid\Column|Collection bio
@@ -178,11 +187,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection packagesize
      * @property Grid\Column|Collection downloadurl
      * @property Grid\Column|Collection enforce
-     * @property Grid\Column|Collection connection
-     * @property Grid\Column|Collection queue
-     * @property Grid\Column|Collection payload
-     * @property Grid\Column|Collection exception
-     * @property Grid\Column|Collection failed_at
      * @property Grid\Column|Collection acid
      * @property Grid\Column|Collection uniacid
      * @property Grid\Column|Collection hash
@@ -256,9 +260,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection item
      * @property Grid\Column|Collection area_name
      * @property Grid\Column|Collection num
-     * @property Grid\Column|Collection store_id
      * @property Grid\Column|Collection stars
-     * @property Grid\Column|Collection time
      * @property Grid\Column|Collection order_id
      * @property Grid\Column|Collection hf
      * @property Grid\Column|Collection hf_time
@@ -357,14 +359,12 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection display
      * @property Grid\Column|Collection introduction
      * @property Grid\Column|Collection hx_id
-     * @property Grid\Column|Collection order_num
      * @property Grid\Column|Collection goods_type
      * @property Grid\Column|Collection goods_num
      * @property Grid\Column|Collection pay_type
      * @property Grid\Column|Collection receive_name
      * @property Grid\Column|Collection receive_tel
      * @property Grid\Column|Collection receive_address
-     * @property Grid\Column|Collection pay_time
      * @property Grid\Column|Collection cz_time
      * @property Grid\Column|Collection question
      * @property Grid\Column|Collection answer
@@ -482,6 +482,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection combination_id
      * @property Grid\Column|Collection order_status
      * @property Grid\Column|Collection update_time
+     * @property Grid\Column|Collection refund_time
      * @property Grid\Column|Collection order_shipping_code
      * @property Grid\Column|Collection shipping_name
      * @property Grid\Column|Collection store_ids
@@ -493,6 +494,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection dada_status
      * @property Grid\Column|Collection print_num
      * @property Grid\Column|Collection global_order_id
+     * @property Grid\Column|Collection plat
      * @property Grid\Column|Collection mchid
      * @property Grid\Column|Collection wxkey
      * @property Grid\Column|Collection apiclient_cert
@@ -562,9 +564,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection store_mchid
      * @property Grid\Column|Collection cash_code
      * @property Grid\Column|Collection store_wallet
-     * @property Grid\Column|Collection mm_user_id
      * @property Grid\Column|Collection add_time
-     * @property Grid\Column|Collection category
      * @property Grid\Column|Collection xyh_open
      * @property Grid\Column|Collection is_jd
      * @property Grid\Column|Collection is_jfpay
@@ -697,7 +697,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection is_open_dada_fee
      * @property Grid\Column|Collection menu_name
      * @property Grid\Column|Collection info
-     * @property Grid\Column|Collection desc
      * @property Grid\Column|Collection tag
      * @property Grid\Column|Collection fw_cost
      * @property Grid\Column|Collection zd_cost
@@ -766,6 +765,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection minute
      * @property Grid\Column|Collection extra
      * @property Grid\Column|Collection tid
+     * @property Grid\Column|Collection payload
      * @property Grid\Column|Collection handled
      * @property Grid\Column|Collection total
      * @property Grid\Column|Collection append_title
@@ -1154,13 +1154,26 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection logo_url
      * @property Grid\Column|Collection success
      * @property Grid\Column|Collection error
+     * @property Grid\Column|Collection cover_img
      * @property Grid\Column|Collection qrcode_path
      * @property Grid\Column|Collection user_type
      * @property Grid\Column|Collection money_type
      * @property Grid\Column|Collection source_type
      * @property Grid\Column|Collection comment
-     * @property Grid\Column|Collection is_del
+     * @property Grid\Column|Collection goods_type_id
+     * @property Grid\Column|Collection on_sale
+     * @property Grid\Column|Collection is_infinite
+     * @property Grid\Column|Collection original_price
+     * @property Grid\Column|Collection vip_price
+     * @property Grid\Column|Collection tags
+     * @property Grid\Column|Collection details_imgs
      * @property Grid\Column|Collection is_operated
+     * @property Grid\Column|Collection distribution_money
+     * @property Grid\Column|Collection refuse_note
+     * @property Grid\Column|Collection shipping_type
+     * @property Grid\Column|Collection coupon_money
+     * @property Grid\Column|Collection delivery_money
+     * @property Grid\Column|Collection delivery_status
      * @property Grid\Column|Collection c_attitude
      * @property Grid\Column|Collection c_service
      * @property Grid\Column|Collection c_quality
@@ -1172,10 +1185,20 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection set_reward
      * @property Grid\Column|Collection device_name
      * @property Grid\Column|Collection bind_time
+     * @property Grid\Column|Collection store_type_id
+     * @property Grid\Column|Collection stall_info
+     * @property Grid\Column|Collection business_license
+     * @property Grid\Column|Collection expire_time
+     * @property Grid\Column|Collection time1
+     * @property Grid\Column|Collection pay_status
+     * @property Grid\Column|Collection apply_time
+     * @property Grid\Column|Collection store_applet_img
+     * @property Grid\Column|Collection cash_code_img
+     * @property Grid\Column|Collection nick_name
+     * @property Grid\Column|Collection real_name
      * @property Grid\Column|Collection balance
      * @property Grid\Column|Collection bind_type
      * @property Grid\Column|Collection json_data
-     * @property Grid\Column|Collection email_verified_at
      *
      * @method Grid\Column|Collection id(string $label = null)
      * @method Grid\Column|Collection username(string $label = null)
@@ -1235,14 +1258,26 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection mm_id(string $label = null)
      * @method Grid\Column|Collection admin_user_id(string $label = null)
      * @method Grid\Column|Collection cs_id(string $label = null)
+     * @method Grid\Column|Collection type(string $label = null)
+     * @method Grid\Column|Collection user_id(string $label = null)
+     * @method Grid\Column|Collection desc(string $label = null)
      * @method Grid\Column|Collection activity(string $label = null)
      * @method Grid\Column|Collection forward(string $label = null)
      * @method Grid\Column|Collection repay(string $label = null)
+     * @method Grid\Column|Collection category(string $label = null)
+     * @method Grid\Column|Collection value(string $label = null)
+     * @method Grid\Column|Collection store_id(string $label = null)
+     * @method Grid\Column|Collection store_name(string $label = null)
+     * @method Grid\Column|Collection new_user_total(string $label = null)
+     * @method Grid\Column|Collection mm_user_id(string $label = null)
+     * @method Grid\Column|Collection order_num(string $label = null)
+     * @method Grid\Column|Collection state(string $label = null)
+     * @method Grid\Column|Collection time(string $label = null)
+     * @method Grid\Column|Collection pay_time(string $label = null)
      * @method Grid\Column|Collection parent_id(string $label = null)
      * @method Grid\Column|Collection order(string $label = null)
      * @method Grid\Column|Collection icon(string $label = null)
      * @method Grid\Column|Collection uri(string $label = null)
-     * @method Grid\Column|Collection user_id(string $label = null)
      * @method Grid\Column|Collection permission_id(string $label = null)
      * @method Grid\Column|Collection menu_id(string $label = null)
      * @method Grid\Column|Collection http_method(string $label = null)
@@ -1288,7 +1323,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection rules(string $label = null)
      * @method Grid\Column|Collection uid(string $label = null)
      * @method Grid\Column|Collection group_id(string $label = null)
-     * @method Grid\Column|Collection type(string $label = null)
      * @method Grid\Column|Collection condition(string $label = null)
      * @method Grid\Column|Collection ismenu(string $label = null)
      * @method Grid\Column|Collection weigh(string $label = null)
@@ -1301,7 +1335,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection executetime(string $label = null)
      * @method Grid\Column|Collection group(string $label = null)
      * @method Grid\Column|Collection tip(string $label = null)
-     * @method Grid\Column|Collection value(string $label = null)
      * @method Grid\Column|Collection rule(string $label = null)
      * @method Grid\Column|Collection extend(string $label = null)
      * @method Grid\Column|Collection event(string $label = null)
@@ -1324,7 +1357,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection refreshtime(string $label = null)
      * @method Grid\Column|Collection deletetime(string $label = null)
      * @method Grid\Column|Collection switch(string $label = null)
-     * @method Grid\Column|Collection state(string $label = null)
      * @method Grid\Column|Collection gender(string $label = null)
      * @method Grid\Column|Collection birthday(string $label = null)
      * @method Grid\Column|Collection bio(string $label = null)
@@ -1344,11 +1376,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection packagesize(string $label = null)
      * @method Grid\Column|Collection downloadurl(string $label = null)
      * @method Grid\Column|Collection enforce(string $label = null)
-     * @method Grid\Column|Collection connection(string $label = null)
-     * @method Grid\Column|Collection queue(string $label = null)
-     * @method Grid\Column|Collection payload(string $label = null)
-     * @method Grid\Column|Collection exception(string $label = null)
-     * @method Grid\Column|Collection failed_at(string $label = null)
      * @method Grid\Column|Collection acid(string $label = null)
      * @method Grid\Column|Collection uniacid(string $label = null)
      * @method Grid\Column|Collection hash(string $label = null)
@@ -1422,9 +1449,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection item(string $label = null)
      * @method Grid\Column|Collection area_name(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
-     * @method Grid\Column|Collection store_id(string $label = null)
      * @method Grid\Column|Collection stars(string $label = null)
-     * @method Grid\Column|Collection time(string $label = null)
      * @method Grid\Column|Collection order_id(string $label = null)
      * @method Grid\Column|Collection hf(string $label = null)
      * @method Grid\Column|Collection hf_time(string $label = null)
@@ -1523,14 +1548,12 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection display(string $label = null)
      * @method Grid\Column|Collection introduction(string $label = null)
      * @method Grid\Column|Collection hx_id(string $label = null)
-     * @method Grid\Column|Collection order_num(string $label = null)
      * @method Grid\Column|Collection goods_type(string $label = null)
      * @method Grid\Column|Collection goods_num(string $label = null)
      * @method Grid\Column|Collection pay_type(string $label = null)
      * @method Grid\Column|Collection receive_name(string $label = null)
      * @method Grid\Column|Collection receive_tel(string $label = null)
      * @method Grid\Column|Collection receive_address(string $label = null)
-     * @method Grid\Column|Collection pay_time(string $label = null)
      * @method Grid\Column|Collection cz_time(string $label = null)
      * @method Grid\Column|Collection question(string $label = null)
      * @method Grid\Column|Collection answer(string $label = null)
@@ -1648,6 +1671,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection combination_id(string $label = null)
      * @method Grid\Column|Collection order_status(string $label = null)
      * @method Grid\Column|Collection update_time(string $label = null)
+     * @method Grid\Column|Collection refund_time(string $label = null)
      * @method Grid\Column|Collection order_shipping_code(string $label = null)
      * @method Grid\Column|Collection shipping_name(string $label = null)
      * @method Grid\Column|Collection store_ids(string $label = null)
@@ -1659,6 +1683,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection dada_status(string $label = null)
      * @method Grid\Column|Collection print_num(string $label = null)
      * @method Grid\Column|Collection global_order_id(string $label = null)
+     * @method Grid\Column|Collection plat(string $label = null)
      * @method Grid\Column|Collection mchid(string $label = null)
      * @method Grid\Column|Collection wxkey(string $label = null)
      * @method Grid\Column|Collection apiclient_cert(string $label = null)
@@ -1728,9 +1753,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection store_mchid(string $label = null)
      * @method Grid\Column|Collection cash_code(string $label = null)
      * @method Grid\Column|Collection store_wallet(string $label = null)
-     * @method Grid\Column|Collection mm_user_id(string $label = null)
      * @method Grid\Column|Collection add_time(string $label = null)
-     * @method Grid\Column|Collection category(string $label = null)
      * @method Grid\Column|Collection xyh_open(string $label = null)
      * @method Grid\Column|Collection is_jd(string $label = null)
      * @method Grid\Column|Collection is_jfpay(string $label = null)
@@ -1863,7 +1886,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection is_open_dada_fee(string $label = null)
      * @method Grid\Column|Collection menu_name(string $label = null)
      * @method Grid\Column|Collection info(string $label = null)
-     * @method Grid\Column|Collection desc(string $label = null)
      * @method Grid\Column|Collection tag(string $label = null)
      * @method Grid\Column|Collection fw_cost(string $label = null)
      * @method Grid\Column|Collection zd_cost(string $label = null)
@@ -1932,6 +1954,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection minute(string $label = null)
      * @method Grid\Column|Collection extra(string $label = null)
      * @method Grid\Column|Collection tid(string $label = null)
+     * @method Grid\Column|Collection payload(string $label = null)
      * @method Grid\Column|Collection handled(string $label = null)
      * @method Grid\Column|Collection total(string $label = null)
      * @method Grid\Column|Collection append_title(string $label = null)
@@ -2320,13 +2343,26 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection logo_url(string $label = null)
      * @method Grid\Column|Collection success(string $label = null)
      * @method Grid\Column|Collection error(string $label = null)
+     * @method Grid\Column|Collection cover_img(string $label = null)
      * @method Grid\Column|Collection qrcode_path(string $label = null)
      * @method Grid\Column|Collection user_type(string $label = null)
      * @method Grid\Column|Collection money_type(string $label = null)
      * @method Grid\Column|Collection source_type(string $label = null)
      * @method Grid\Column|Collection comment(string $label = null)
-     * @method Grid\Column|Collection is_del(string $label = null)
+     * @method Grid\Column|Collection goods_type_id(string $label = null)
+     * @method Grid\Column|Collection on_sale(string $label = null)
+     * @method Grid\Column|Collection is_infinite(string $label = null)
+     * @method Grid\Column|Collection original_price(string $label = null)
+     * @method Grid\Column|Collection vip_price(string $label = null)
+     * @method Grid\Column|Collection tags(string $label = null)
+     * @method Grid\Column|Collection details_imgs(string $label = null)
      * @method Grid\Column|Collection is_operated(string $label = null)
+     * @method Grid\Column|Collection distribution_money(string $label = null)
+     * @method Grid\Column|Collection refuse_note(string $label = null)
+     * @method Grid\Column|Collection shipping_type(string $label = null)
+     * @method Grid\Column|Collection coupon_money(string $label = null)
+     * @method Grid\Column|Collection delivery_money(string $label = null)
+     * @method Grid\Column|Collection delivery_status(string $label = null)
      * @method Grid\Column|Collection c_attitude(string $label = null)
      * @method Grid\Column|Collection c_service(string $label = null)
      * @method Grid\Column|Collection c_quality(string $label = null)
@@ -2338,10 +2374,20 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection set_reward(string $label = null)
      * @method Grid\Column|Collection device_name(string $label = null)
      * @method Grid\Column|Collection bind_time(string $label = null)
+     * @method Grid\Column|Collection store_type_id(string $label = null)
+     * @method Grid\Column|Collection stall_info(string $label = null)
+     * @method Grid\Column|Collection business_license(string $label = null)
+     * @method Grid\Column|Collection expire_time(string $label = null)
+     * @method Grid\Column|Collection time1(string $label = null)
+     * @method Grid\Column|Collection pay_status(string $label = null)
+     * @method Grid\Column|Collection apply_time(string $label = null)
+     * @method Grid\Column|Collection store_applet_img(string $label = null)
+     * @method Grid\Column|Collection cash_code_img(string $label = null)
+     * @method Grid\Column|Collection nick_name(string $label = null)
+     * @method Grid\Column|Collection real_name(string $label = null)
      * @method Grid\Column|Collection balance(string $label = null)
      * @method Grid\Column|Collection bind_type(string $label = null)
      * @method Grid\Column|Collection json_data(string $label = null)
-     * @method Grid\Column|Collection email_verified_at(string $label = null)
      */
     class Grid {}
 
@@ -2406,14 +2452,26 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection mm_id
      * @property Show\Field|Collection admin_user_id
      * @property Show\Field|Collection cs_id
+     * @property Show\Field|Collection type
+     * @property Show\Field|Collection user_id
+     * @property Show\Field|Collection desc
      * @property Show\Field|Collection activity
      * @property Show\Field|Collection forward
      * @property Show\Field|Collection repay
+     * @property Show\Field|Collection category
+     * @property Show\Field|Collection value
+     * @property Show\Field|Collection store_id
+     * @property Show\Field|Collection store_name
+     * @property Show\Field|Collection new_user_total
+     * @property Show\Field|Collection mm_user_id
+     * @property Show\Field|Collection order_num
+     * @property Show\Field|Collection state
+     * @property Show\Field|Collection time
+     * @property Show\Field|Collection pay_time
      * @property Show\Field|Collection parent_id
      * @property Show\Field|Collection order
      * @property Show\Field|Collection icon
      * @property Show\Field|Collection uri
-     * @property Show\Field|Collection user_id
      * @property Show\Field|Collection permission_id
      * @property Show\Field|Collection menu_id
      * @property Show\Field|Collection http_method
@@ -2459,7 +2517,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection rules
      * @property Show\Field|Collection uid
      * @property Show\Field|Collection group_id
-     * @property Show\Field|Collection type
      * @property Show\Field|Collection condition
      * @property Show\Field|Collection ismenu
      * @property Show\Field|Collection weigh
@@ -2472,7 +2529,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection executetime
      * @property Show\Field|Collection group
      * @property Show\Field|Collection tip
-     * @property Show\Field|Collection value
      * @property Show\Field|Collection rule
      * @property Show\Field|Collection extend
      * @property Show\Field|Collection event
@@ -2495,7 +2551,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection refreshtime
      * @property Show\Field|Collection deletetime
      * @property Show\Field|Collection switch
-     * @property Show\Field|Collection state
      * @property Show\Field|Collection gender
      * @property Show\Field|Collection birthday
      * @property Show\Field|Collection bio
@@ -2515,11 +2570,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection packagesize
      * @property Show\Field|Collection downloadurl
      * @property Show\Field|Collection enforce
-     * @property Show\Field|Collection connection
-     * @property Show\Field|Collection queue
-     * @property Show\Field|Collection payload
-     * @property Show\Field|Collection exception
-     * @property Show\Field|Collection failed_at
      * @property Show\Field|Collection acid
      * @property Show\Field|Collection uniacid
      * @property Show\Field|Collection hash
@@ -2593,9 +2643,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection item
      * @property Show\Field|Collection area_name
      * @property Show\Field|Collection num
-     * @property Show\Field|Collection store_id
      * @property Show\Field|Collection stars
-     * @property Show\Field|Collection time
      * @property Show\Field|Collection order_id
      * @property Show\Field|Collection hf
      * @property Show\Field|Collection hf_time
@@ -2694,14 +2742,12 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection display
      * @property Show\Field|Collection introduction
      * @property Show\Field|Collection hx_id
-     * @property Show\Field|Collection order_num
      * @property Show\Field|Collection goods_type
      * @property Show\Field|Collection goods_num
      * @property Show\Field|Collection pay_type
      * @property Show\Field|Collection receive_name
      * @property Show\Field|Collection receive_tel
      * @property Show\Field|Collection receive_address
-     * @property Show\Field|Collection pay_time
      * @property Show\Field|Collection cz_time
      * @property Show\Field|Collection question
      * @property Show\Field|Collection answer
@@ -2819,6 +2865,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection combination_id
      * @property Show\Field|Collection order_status
      * @property Show\Field|Collection update_time
+     * @property Show\Field|Collection refund_time
      * @property Show\Field|Collection order_shipping_code
      * @property Show\Field|Collection shipping_name
      * @property Show\Field|Collection store_ids
@@ -2830,6 +2877,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection dada_status
      * @property Show\Field|Collection print_num
      * @property Show\Field|Collection global_order_id
+     * @property Show\Field|Collection plat
      * @property Show\Field|Collection mchid
      * @property Show\Field|Collection wxkey
      * @property Show\Field|Collection apiclient_cert
@@ -2899,9 +2947,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection store_mchid
      * @property Show\Field|Collection cash_code
      * @property Show\Field|Collection store_wallet
-     * @property Show\Field|Collection mm_user_id
      * @property Show\Field|Collection add_time
-     * @property Show\Field|Collection category
      * @property Show\Field|Collection xyh_open
      * @property Show\Field|Collection is_jd
      * @property Show\Field|Collection is_jfpay
@@ -3034,7 +3080,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection is_open_dada_fee
      * @property Show\Field|Collection menu_name
      * @property Show\Field|Collection info
-     * @property Show\Field|Collection desc
      * @property Show\Field|Collection tag
      * @property Show\Field|Collection fw_cost
      * @property Show\Field|Collection zd_cost
@@ -3103,6 +3148,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection minute
      * @property Show\Field|Collection extra
      * @property Show\Field|Collection tid
+     * @property Show\Field|Collection payload
      * @property Show\Field|Collection handled
      * @property Show\Field|Collection total
      * @property Show\Field|Collection append_title
@@ -3491,13 +3537,26 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection logo_url
      * @property Show\Field|Collection success
      * @property Show\Field|Collection error
+     * @property Show\Field|Collection cover_img
      * @property Show\Field|Collection qrcode_path
      * @property Show\Field|Collection user_type
      * @property Show\Field|Collection money_type
      * @property Show\Field|Collection source_type
      * @property Show\Field|Collection comment
-     * @property Show\Field|Collection is_del
+     * @property Show\Field|Collection goods_type_id
+     * @property Show\Field|Collection on_sale
+     * @property Show\Field|Collection is_infinite
+     * @property Show\Field|Collection original_price
+     * @property Show\Field|Collection vip_price
+     * @property Show\Field|Collection tags
+     * @property Show\Field|Collection details_imgs
      * @property Show\Field|Collection is_operated
+     * @property Show\Field|Collection distribution_money
+     * @property Show\Field|Collection refuse_note
+     * @property Show\Field|Collection shipping_type
+     * @property Show\Field|Collection coupon_money
+     * @property Show\Field|Collection delivery_money
+     * @property Show\Field|Collection delivery_status
      * @property Show\Field|Collection c_attitude
      * @property Show\Field|Collection c_service
      * @property Show\Field|Collection c_quality
@@ -3509,10 +3568,20 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection set_reward
      * @property Show\Field|Collection device_name
      * @property Show\Field|Collection bind_time
+     * @property Show\Field|Collection store_type_id
+     * @property Show\Field|Collection stall_info
+     * @property Show\Field|Collection business_license
+     * @property Show\Field|Collection expire_time
+     * @property Show\Field|Collection time1
+     * @property Show\Field|Collection pay_status
+     * @property Show\Field|Collection apply_time
+     * @property Show\Field|Collection store_applet_img
+     * @property Show\Field|Collection cash_code_img
+     * @property Show\Field|Collection nick_name
+     * @property Show\Field|Collection real_name
      * @property Show\Field|Collection balance
      * @property Show\Field|Collection bind_type
      * @property Show\Field|Collection json_data
-     * @property Show\Field|Collection email_verified_at
      *
      * @method Show\Field|Collection id(string $label = null)
      * @method Show\Field|Collection username(string $label = null)
@@ -3572,14 +3641,26 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection mm_id(string $label = null)
      * @method Show\Field|Collection admin_user_id(string $label = null)
      * @method Show\Field|Collection cs_id(string $label = null)
+     * @method Show\Field|Collection type(string $label = null)
+     * @method Show\Field|Collection user_id(string $label = null)
+     * @method Show\Field|Collection desc(string $label = null)
      * @method Show\Field|Collection activity(string $label = null)
      * @method Show\Field|Collection forward(string $label = null)
      * @method Show\Field|Collection repay(string $label = null)
+     * @method Show\Field|Collection category(string $label = null)
+     * @method Show\Field|Collection value(string $label = null)
+     * @method Show\Field|Collection store_id(string $label = null)
+     * @method Show\Field|Collection store_name(string $label = null)
+     * @method Show\Field|Collection new_user_total(string $label = null)
+     * @method Show\Field|Collection mm_user_id(string $label = null)
+     * @method Show\Field|Collection order_num(string $label = null)
+     * @method Show\Field|Collection state(string $label = null)
+     * @method Show\Field|Collection time(string $label = null)
+     * @method Show\Field|Collection pay_time(string $label = null)
      * @method Show\Field|Collection parent_id(string $label = null)
      * @method Show\Field|Collection order(string $label = null)
      * @method Show\Field|Collection icon(string $label = null)
      * @method Show\Field|Collection uri(string $label = null)
-     * @method Show\Field|Collection user_id(string $label = null)
      * @method Show\Field|Collection permission_id(string $label = null)
      * @method Show\Field|Collection menu_id(string $label = null)
      * @method Show\Field|Collection http_method(string $label = null)
@@ -3625,7 +3706,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection rules(string $label = null)
      * @method Show\Field|Collection uid(string $label = null)
      * @method Show\Field|Collection group_id(string $label = null)
-     * @method Show\Field|Collection type(string $label = null)
      * @method Show\Field|Collection condition(string $label = null)
      * @method Show\Field|Collection ismenu(string $label = null)
      * @method Show\Field|Collection weigh(string $label = null)
@@ -3638,7 +3718,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection executetime(string $label = null)
      * @method Show\Field|Collection group(string $label = null)
      * @method Show\Field|Collection tip(string $label = null)
-     * @method Show\Field|Collection value(string $label = null)
      * @method Show\Field|Collection rule(string $label = null)
      * @method Show\Field|Collection extend(string $label = null)
      * @method Show\Field|Collection event(string $label = null)
@@ -3661,7 +3740,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection refreshtime(string $label = null)
      * @method Show\Field|Collection deletetime(string $label = null)
      * @method Show\Field|Collection switch(string $label = null)
-     * @method Show\Field|Collection state(string $label = null)
      * @method Show\Field|Collection gender(string $label = null)
      * @method Show\Field|Collection birthday(string $label = null)
      * @method Show\Field|Collection bio(string $label = null)
@@ -3681,11 +3759,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection packagesize(string $label = null)
      * @method Show\Field|Collection downloadurl(string $label = null)
      * @method Show\Field|Collection enforce(string $label = null)
-     * @method Show\Field|Collection connection(string $label = null)
-     * @method Show\Field|Collection queue(string $label = null)
-     * @method Show\Field|Collection payload(string $label = null)
-     * @method Show\Field|Collection exception(string $label = null)
-     * @method Show\Field|Collection failed_at(string $label = null)
      * @method Show\Field|Collection acid(string $label = null)
      * @method Show\Field|Collection uniacid(string $label = null)
      * @method Show\Field|Collection hash(string $label = null)
@@ -3759,9 +3832,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection item(string $label = null)
      * @method Show\Field|Collection area_name(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
-     * @method Show\Field|Collection store_id(string $label = null)
      * @method Show\Field|Collection stars(string $label = null)
-     * @method Show\Field|Collection time(string $label = null)
      * @method Show\Field|Collection order_id(string $label = null)
      * @method Show\Field|Collection hf(string $label = null)
      * @method Show\Field|Collection hf_time(string $label = null)
@@ -3860,14 +3931,12 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection display(string $label = null)
      * @method Show\Field|Collection introduction(string $label = null)
      * @method Show\Field|Collection hx_id(string $label = null)
-     * @method Show\Field|Collection order_num(string $label = null)
      * @method Show\Field|Collection goods_type(string $label = null)
      * @method Show\Field|Collection goods_num(string $label = null)
      * @method Show\Field|Collection pay_type(string $label = null)
      * @method Show\Field|Collection receive_name(string $label = null)
      * @method Show\Field|Collection receive_tel(string $label = null)
      * @method Show\Field|Collection receive_address(string $label = null)
-     * @method Show\Field|Collection pay_time(string $label = null)
      * @method Show\Field|Collection cz_time(string $label = null)
      * @method Show\Field|Collection question(string $label = null)
      * @method Show\Field|Collection answer(string $label = null)
@@ -3985,6 +4054,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection combination_id(string $label = null)
      * @method Show\Field|Collection order_status(string $label = null)
      * @method Show\Field|Collection update_time(string $label = null)
+     * @method Show\Field|Collection refund_time(string $label = null)
      * @method Show\Field|Collection order_shipping_code(string $label = null)
      * @method Show\Field|Collection shipping_name(string $label = null)
      * @method Show\Field|Collection store_ids(string $label = null)
@@ -3996,6 +4066,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection dada_status(string $label = null)
      * @method Show\Field|Collection print_num(string $label = null)
      * @method Show\Field|Collection global_order_id(string $label = null)
+     * @method Show\Field|Collection plat(string $label = null)
      * @method Show\Field|Collection mchid(string $label = null)
      * @method Show\Field|Collection wxkey(string $label = null)
      * @method Show\Field|Collection apiclient_cert(string $label = null)
@@ -4065,9 +4136,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection store_mchid(string $label = null)
      * @method Show\Field|Collection cash_code(string $label = null)
      * @method Show\Field|Collection store_wallet(string $label = null)
-     * @method Show\Field|Collection mm_user_id(string $label = null)
      * @method Show\Field|Collection add_time(string $label = null)
-     * @method Show\Field|Collection category(string $label = null)
      * @method Show\Field|Collection xyh_open(string $label = null)
      * @method Show\Field|Collection is_jd(string $label = null)
      * @method Show\Field|Collection is_jfpay(string $label = null)
@@ -4200,7 +4269,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection is_open_dada_fee(string $label = null)
      * @method Show\Field|Collection menu_name(string $label = null)
      * @method Show\Field|Collection info(string $label = null)
-     * @method Show\Field|Collection desc(string $label = null)
      * @method Show\Field|Collection tag(string $label = null)
      * @method Show\Field|Collection fw_cost(string $label = null)
      * @method Show\Field|Collection zd_cost(string $label = null)
@@ -4269,6 +4337,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection minute(string $label = null)
      * @method Show\Field|Collection extra(string $label = null)
      * @method Show\Field|Collection tid(string $label = null)
+     * @method Show\Field|Collection payload(string $label = null)
      * @method Show\Field|Collection handled(string $label = null)
      * @method Show\Field|Collection total(string $label = null)
      * @method Show\Field|Collection append_title(string $label = null)
@@ -4657,13 +4726,26 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection logo_url(string $label = null)
      * @method Show\Field|Collection success(string $label = null)
      * @method Show\Field|Collection error(string $label = null)
+     * @method Show\Field|Collection cover_img(string $label = null)
      * @method Show\Field|Collection qrcode_path(string $label = null)
      * @method Show\Field|Collection user_type(string $label = null)
      * @method Show\Field|Collection money_type(string $label = null)
      * @method Show\Field|Collection source_type(string $label = null)
      * @method Show\Field|Collection comment(string $label = null)
-     * @method Show\Field|Collection is_del(string $label = null)
+     * @method Show\Field|Collection goods_type_id(string $label = null)
+     * @method Show\Field|Collection on_sale(string $label = null)
+     * @method Show\Field|Collection is_infinite(string $label = null)
+     * @method Show\Field|Collection original_price(string $label = null)
+     * @method Show\Field|Collection vip_price(string $label = null)
+     * @method Show\Field|Collection tags(string $label = null)
+     * @method Show\Field|Collection details_imgs(string $label = null)
      * @method Show\Field|Collection is_operated(string $label = null)
+     * @method Show\Field|Collection distribution_money(string $label = null)
+     * @method Show\Field|Collection refuse_note(string $label = null)
+     * @method Show\Field|Collection shipping_type(string $label = null)
+     * @method Show\Field|Collection coupon_money(string $label = null)
+     * @method Show\Field|Collection delivery_money(string $label = null)
+     * @method Show\Field|Collection delivery_status(string $label = null)
      * @method Show\Field|Collection c_attitude(string $label = null)
      * @method Show\Field|Collection c_service(string $label = null)
      * @method Show\Field|Collection c_quality(string $label = null)
@@ -4675,10 +4757,20 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection set_reward(string $label = null)
      * @method Show\Field|Collection device_name(string $label = null)
      * @method Show\Field|Collection bind_time(string $label = null)
+     * @method Show\Field|Collection store_type_id(string $label = null)
+     * @method Show\Field|Collection stall_info(string $label = null)
+     * @method Show\Field|Collection business_license(string $label = null)
+     * @method Show\Field|Collection expire_time(string $label = null)
+     * @method Show\Field|Collection time1(string $label = null)
+     * @method Show\Field|Collection pay_status(string $label = null)
+     * @method Show\Field|Collection apply_time(string $label = null)
+     * @method Show\Field|Collection store_applet_img(string $label = null)
+     * @method Show\Field|Collection cash_code_img(string $label = null)
+     * @method Show\Field|Collection nick_name(string $label = null)
+     * @method Show\Field|Collection real_name(string $label = null)
      * @method Show\Field|Collection balance(string $label = null)
      * @method Show\Field|Collection bind_type(string $label = null)
      * @method Show\Field|Collection json_data(string $label = null)
-     * @method Show\Field|Collection email_verified_at(string $label = null)
      */
     class Show {}
 
diff --git a/resources/lang/zh-CN/lanzu-service-horseman.php b/resources/lang/zh-CN/lanzu-service-horseman.php
new file mode 100644
index 0000000..7b52884
--- /dev/null
+++ b/resources/lang/zh-CN/lanzu-service-horseman.php
@@ -0,0 +1,17 @@
+<?php 
+return [
+    'labels' => [
+        'LanzuServiceHorseman' => 'LanzuServiceHorseman',
+    ],
+    'fields' => [
+        'user_id' => '用户id',
+        'name' => '姓名',
+        'tel' => '电话',
+        'market_id' => '市场id',
+        'status' => '状态  -1禁用 1正常 2删除',
+        'qr_url' => '骑手二维码',
+        'head_url' => '头像',
+    ],
+    'options' => [
+    ],
+];

From 7f3e3dd7fe17672f7c52b2a8f1816fe87f28032d Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Wed, 2 Sep 2020 21:07:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImsCjdcOrderMainController.php            |   6 +
 .../LanzuServiceHorsemanController.php        |  35 +-
 app/Admin/Extensions/OrderPrint.php           |  34 ++
 app/Admin/Extensions/OrderStateHandle.php     |   9 +-
 app/Libs/feier_print/api_php_demo.php         | 326 ++++++++++++++++++
 app/Libs/feier_print/httpclient.php           | 307 +++++++++++++++++
 .../飞鹅云打印说明文档.txt           |  46 +++
 app/Models/ImsCjdcMarket.php                  |  16 +-
 app/Models/ImsCjdcOrderMain.php               |   5 +-
 app/Models/LanzuServiceHorseman.php           |   2 +-
 10 files changed, 768 insertions(+), 18 deletions(-)
 create mode 100644 app/Admin/Extensions/OrderPrint.php
 create mode 100644 app/Libs/feier_print/api_php_demo.php
 create mode 100644 app/Libs/feier_print/httpclient.php
 create mode 100644 app/Libs/feier_print/飞鹅云打印说明文档.txt

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index b8d4ecc..a40ba17 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Extensions\OrderDetail;
+use App\Admin\Extensions\OrderPrint;
 use App\Admin\Extensions\OrderStateHandle;
 use App\Admin\Repositories\ImsCjdcOrderMain;
 use Dcat\Admin\Admin;
@@ -44,9 +45,14 @@ class ImsCjdcOrderMainController extends AdminController
                 $state = $actions->row->state;
                 if ($state==2){
                     $actions->append(new OrderStateHandle('接单',3));
+                    $actions->append(new OrderPrint('打印'));
                 }elseif ($state==31){
                     $actions->append(new OrderStateHandle('完成',4));
+                    $actions->append(new OrderPrint('打印'));
+                }elseif ($state==3){
+                    $actions->append(new OrderStateHandle('站内自送',30));
                 }
+
                 $actions->append(new OrderDetail('详情'));
 
                 //$actions->append("<a class='btn btn-xs action-btn btn-danger grid-row-refuse' data-id='{$actions->getKey()}'><i class='fa fa-close' title='拒绝退款'>拒绝</i></a>&nbsp;&nbsp;");
diff --git a/app/Admin/Controllers/LanzuServiceHorsemanController.php b/app/Admin/Controllers/LanzuServiceHorsemanController.php
index 4a5e39b..0feca6f 100644
--- a/app/Admin/Controllers/LanzuServiceHorsemanController.php
+++ b/app/Admin/Controllers/LanzuServiceHorsemanController.php
@@ -22,10 +22,14 @@ class LanzuServiceHorsemanController extends AdminController
             $grid->id->sortable();
             $grid->name;
             $grid->tel;
-            $grid->market_id('所属市场');
-            $grid->status('状态');
-            $grid->head_url;
-            $grid->created_at;
+            $grid->market_id('所属市场')->display(function (){
+                return ImsCjdcMarket::find($this->market_id)->name;
+            });
+            $grid->status('状态')->using([1=>'正常',-1=>'禁用']);
+            $grid->head_url->image('',50,50);
+            $grid->created_at->display(function ($time){
+                return date('Y-m-d H:i',$time);
+            });
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 
@@ -44,15 +48,20 @@ class LanzuServiceHorsemanController extends AdminController
     {
         return Show::make($id, new LanzuServiceHorseman(), function (Show $show) {
             $show->id;
-            $show->user_id;
+            $show->user_id('懒ID');
             $show->name;
             $show->tel;
-            $show->market_id;
-            $show->status;
-            $show->qr_url;
-            $show->head_url;
-            $show->created_at;
-            $show->updated_at;
+            $show->market_id('所属市场')->as(function (){
+               return ImsCjdcMarket::find($this->market_id)->name;
+            });
+            $show->status('状态')->using([1=>'正常',-1=>'禁用']);
+            $show->head_url->image();
+            $show->created_at->as(function ($time){
+                return date('Y-m-d H:i',$time);
+            });
+            $show->updated_at->as(function ($time){
+                return date('Y-m-d H:i',$time);
+            });
         });
     }
 
@@ -68,9 +77,9 @@ class LanzuServiceHorsemanController extends AdminController
             $form->text('user_id','懒ID')->required();
             $form->text('name')->required();
             $form->mobile('tel')->required();
-            $form->text('market_id','所属市场')->options(ImsCjdcMarket::getMarket())->required();
+            $form->select('market_id','所属市场')->options(ImsCjdcMarket::getMarket())->required();
             $form->radio('status','状态')->options([1=>'启用',-1=>'禁用'])->value(1)->required();
-            $form->image('head_url')->uniqueName();
+            $form->image('head_url')->uniqueName()->required();
 
             $form->display('created_at');
             $form->display('updated_at');
diff --git a/app/Admin/Extensions/OrderPrint.php b/app/Admin/Extensions/OrderPrint.php
new file mode 100644
index 0000000..d813fd1
--- /dev/null
+++ b/app/Admin/Extensions/OrderPrint.php
@@ -0,0 +1,34 @@
+<?php
+
+
+namespace App\Admin\Extensions;
+
+
+use Dcat\Admin\Grid\RowAction;
+use Illuminate\Http\Request;
+
+class OrderPrint extends RowAction
+{
+    protected $title;
+    public function __construct($title=null)
+    {
+        parent::__construct($title);
+
+    }
+
+    public function handle(Request $request)
+    {
+        $id = $this->getKey();
+        dd($id);
+    }
+
+    /**
+     * 设置要POST到接口的数据
+     *
+     * @return array
+     */
+    public function parameters()
+    {
+
+    }
+}
diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php
index 3615407..5e34e39 100644
--- a/app/Admin/Extensions/OrderStateHandle.php
+++ b/app/Admin/Extensions/OrderStateHandle.php
@@ -33,7 +33,14 @@ class OrderStateHandle extends RowAction
         $id = $this->getKey();
         $orderMain = new ImsCjdcOrderMain();
         $state = $request->get('state');
-        $res = $orderMain->modifyState($id,$state);
+        if ($state==30){
+            $res = $orderMain->updateShippingType($id,1);
+        }elseif ($state==100){
+
+        }else{
+            $res = $orderMain->modifyState($id,$state);
+        }
+
         if ($res==true){
             return $this->response()->success('操作成功')->refresh();
         }else{
diff --git a/app/Libs/feier_print/api_php_demo.php b/app/Libs/feier_print/api_php_demo.php
new file mode 100644
index 0000000..916993a
--- /dev/null
+++ b/app/Libs/feier_print/api_php_demo.php
@@ -0,0 +1,326 @@
+<?php
+
+use think\Db;
+
+header("Content-type: text/html; charset=utf-8");
+include 'httpclient.php';
+
+define('USER', '13161443713@163.com');  //*必填*：飞鹅云后台注册账号
+define('UKEY', 'XsaHzgePdyWTfcMX');  //*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
+define('SN', '550510805');      //*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
+
+//以下参数不需要修改
+define('IP', 'api.feieyun.cn');      //接口IP或域名
+define('PORT', 80);            //接口IP端口
+define('PATH', '/Api/Open/');    //接口路径
+
+//拼凑订单内容时可参考如下格式
+//根据打印纸张的宽度，自行调整内容的格式，可参考下面的样例格式
+$content = '<CB>测试打印</CB><BR>';
+$content .= '名称　　　　　 单价  数量 金额<BR>';
+$content .= '--------------------------------<BR>';
+$content .= '饭　　　　　 　10.0   10  100.0<BR>';
+$content .= '炒饭　　　　　 10.0   10  100.0<BR>';
+$content .= '蛋炒饭　　　　 10.0   10  100.0<BR>';
+$content .= '鸡蛋炒饭　　　 10.0   10  100.0<BR>';
+$content .= '西红柿炒饭　　 10.0   10  100.0<BR>';
+$content .= '西红柿蛋炒饭　 10.0   10  100.0<BR>';
+$content .= '西红柿鸡蛋炒饭 10.0   10  100.0<BR>';
+$content .= '--------------------------------<BR>';
+$content .= '备注：加辣<BR>';
+$content .= '合计：xx.0元<BR>';
+$content .= '送货地点：广西南宁五象新区<BR>';
+$content .= '联系电话：13888888888888<BR>';
+$content .= '订餐时间：2014-08-08 08:08:08<BR>';
+$content .= '<QR>http://www.feieyun.com</QR>';//把二维码字符串用标签套上即可自动生成二维码
+//标签说明：
+$content = "<DIRECTION>1</DIRECTION>";//设定打印时出纸和打印字体的方向，n 0 或 1，每次设备重启后都会初始化为 0 值设置，1：正向出纸，0：反向出纸，
+$content .= "<TEXT x='9' y='10' font='12' w='1' h='2' r='0'>#001       五号桌      1/3</TEXT><TEXT x='80' y='80' font='12' w='2' h='2' r='0'>可乐鸡翅</TEXT><TEXT x='9' y='180' font='12' w='1' h='1' r='0'>张三先生       13800138000</TEXT>";//40mm宽度标签纸打印例子，打开注释调用标签打印接口打印
+
+/**
+ * [打印订单接口 Open_printMsg]
+ * @param  [string] $sn      [打印机编号sn]
+ * @param  [string] $content [打印内容]
+ * @param  [string] $times   [打印联数]
+ * @return [string]          [接口返回值]
+ */
+function printMsg($sn, $content, $times = 1)
+{
+    $time = time();         //请求时间
+    $msgInfo = array(
+        'user' => USER,
+        'stime' => $time,
+        'sig' => signature($time),
+        'apiname' => 'Open_printMsg',
+        'sn' => $sn,
+        'content' => $content,
+        'times' => $times//打印次数
+    );
+    $client = new HttpClient(IP, PORT);
+    if (!$client->post(PATH, $msgInfo)) {
+        echo 'error';
+    } else {
+        //服务器返回的JSON字符串，建议要当做日志记录起来
+        $result = $client->getContent();
+        return $result;
+    }
+}
+
+/**
+ * [批量添加打印机接口 Open_printerAddlist]
+ * @param  [string] $printerContent [打印机的sn#key]
+ * @return [string]                 [接口返回值]
+ */
+function printerAddlist($printerContent)
+{
+    $time = time();         //请求时间
+    $msgInfo = array(
+        'user' => USER,
+        'stime' => $time,
+        'sig' => signature($time),
+        'apiname' => 'Open_printerAddlist',
+        'printerContent' => $printerContent
+    );
+    $client = new HttpClient(IP, PORT);
+    if (!$client->post(PATH, $msgInfo)) {
+        echo 'error';
+    } else {
+        $result = $client->getContent();
+        return $result;
+    }
+}
+
+/**
+ * [批量删除打印机 Open_printerDelList]
+ * @param  [string] $snlist [打印机编号，多台打印机请用减号“-”连接起来]
+ * @return [string]         [接口返回值]
+ */
+function printerDelList($snlist)
+{
+    $time = time();         //请求时间
+    $msgInfo = array(
+        'user' => USER,
+        'stime' => $time,
+        'sig' => signature($time),
+        'apiname' => 'Open_printerDelList',
+        'snlist' => $snlist
+    );
+    $client = new HttpClient(IP, PORT);
+    if (!$client->post(PATH, $msgInfo)) {
+        echo 'error';
+    } else {
+        $result = $client->getContent();
+        return $result;
+    }
+}
+
+/**
+ * [查询订单是否打印成功接口 Open_queryOrderState]
+ * @param  [string] $orderid [调用打印机接口成功后,服务器返回的JSON中的编号 例如：123456789_20190919163739_95385649]
+ * @return [string]          [接口返回值]
+ */
+function queryOrderState($orderid)
+{
+    $time = time();         //请求时间
+    $msgInfo = array(
+        'user' => USER,
+        'stime' => $time,
+        'sig' => signature($time),
+        'apiname' => 'Open_queryOrderState',
+        'orderid' => $orderid
+    );
+    $client = new HttpClient(IP, PORT);
+    if (!$client->post(PATH, $msgInfo)) {
+        echo 'error';
+    } else {
+        $result = $client->getContent();
+        return $result;
+    }
+}
+
+/**
+ * [signature 生成签名]
+ * @param  [string] $time [当前UNIX时间戳，10位，精确到秒]
+ * @return [string]       [接口返回值]
+ */
+function signature($time)
+{
+    return sha1(USER . UKEY . $time);//公共参数，请求公钥
+}
+
+function FeiePrint($order_num)
+{
+    $data = Db::table('ims_cjdc_order_main')
+        ->alias('m')
+        ->join(['ims_cjdc_order'=>'o'],'o.order_main_id = m.id','inner')
+        ->join(['ims_cjdc_order_goods'=>'g'],'o.id = g.order_id','inner')
+        ->join(['ims_cjdc_feprint'=>'f'],'m.market_id = f.market_id','inner')
+        ->join(['ims_cjdc_store'=>'s'],'s.id = o.store_id','inner')
+        //->distinct(true)
+        ->where('m.order_num',$order_num)
+        ->field("o.note as o_note,g.name,g.number,g.money,g.good_unit,m.delivery_time as ps_time,m.address,m.note,m.name as user_name,m.dada_fee,m.money as m_money,m.yhq_money2,m.box_money,f.sn,m.tel,m.order_num,g.id,g.spec,s.name as shopname")
+        ->order('s.id')
+        ->select();
+//    $order_goods = Db::table('ims_cjdc_order_goods')->where('order_id', $order_main['id'])->field("name,number,money")->select();
+//    $sn = Db::table('ims_cjdc_feprint')->where('market_id', $order_main['market_id'])->value("sn");
+    $content = PrintFormat($data, 14, 6, 3, 6);
+    $res = printMsg($data[0]['sn'], $content, 1);
+    return ($res);
+}
+
+function PrintFormat($arr, $A, $B, $C, $D)
+{
+    $orderInfo = '<CB>懒族生活</CB><BR>';
+    $orderInfo .= '名称           单价  数量 金额<BR>';
+    $orderInfo .= '--------------------------------<BR>';
+    $shopname = "";
+    $shopnum = 0;
+    foreach ($arr as $k5 => $v5) {
+        if ($shopname != $v5['shopname']) {
+            if ($shopname != "") {
+                $orderInfo .= '                                <BR>';
+            }
+            $shopnum++;
+            $orderInfo .= "<C>(" . $shopnum . ")" .$v5['shopname'] . '</C><BR>';
+            $shopname = $v5['shopname'];
+        }
+        $name = $v5['name'];
+        if(!empty($v5['spec'])) {
+            $name .= "(规格:". $v5['spec'].")";
+        }elseif (!empty($v5['good_unit'])){
+            $name .= "(规格:". $v5['good_unit'].")";
+        }
+        $price = $v5['money'];
+        $num = $v5['number'];
+        $prices = sprintf("%.2f",$v5['money']*$v5['number']);
+        $kw3 = '';
+        $kw1 = '';
+        $kw2 = '';
+        $kw4 = '';
+        $str = $name;
+        $blankNum = $A;//名称控制为14个字节
+        $lan = mb_strlen($str,'utf-8');
+        $m = 0;
+        $j=1;
+        $blankNum++;
+        $result = array();
+        if(strlen($price) < $B){
+            $k1 = $B - strlen($price);
+            for($q=0;$q<$k1;$q++){
+                $kw1 .= ' ';
+            }
+            $price = $kw1.$price;
+        }
+        if(strlen($num) < $C){
+            $k2 = $C - strlen($num);
+            for($q=0;$q<$k2;$q++){
+                $kw2 .= ' ';
+            }
+            $num = $kw2.$num;
+        }
+        if(strlen($prices) < $D){
+            $k3 = $D - strlen($prices);
+            for($q=0;$q<$k3;$q++){
+                $kw4 .= ' ';
+            }
+            $prices = $kw4.$prices;
+        }
+        for ($i=0;$i<$lan;$i++){
+            $new = mb_substr($str,$m,$j,'utf-8');
+            $j++;
+            if(mb_strwidth($new,'utf-8')<$blankNum) {
+                if($m+$j>$lan) {
+                    $m = $m+$j;
+                    $tail = $new;
+                    $lenght = iconv("UTF-8", "GBK//IGNORE", $new);
+                    $k = $A - strlen($lenght);
+                    for($q=0;$q<$k;$q++){
+                        $kw3 .= ' ';
+                    }
+                    if($m==$j){
+                        $tail .= $kw3.' '.$price.' '.$num.' '.$prices;
+                    }else{
+                        $tail .= $kw3.'<BR>';
+                    }
+                    break;
+                }else{
+                    $next_new = mb_substr($str,$m,$j,'utf-8');
+                    if(mb_strwidth($next_new,'utf-8')<$blankNum) continue;
+                    else{
+                        $m = $i+1;
+                        $result[] = $new;
+                        $j=1;
+                    }
+                }
+            }
+        }
+        $head = '';
+        foreach ($result as $key=>$value) {
+            if($key < 1){
+                $v_lenght = iconv("UTF-8", "GBK//IGNORE", $value);
+                $v_lenght = strlen($v_lenght);
+                if($v_lenght == 13) $value = $value." ";
+                $head .= $value.' '.$price.' '.$num.' '.$prices;
+            }else{
+                $head .= $value.'<BR>';
+            }
+        }
+        $orderInfo .= $head.$tail;
+        if(!empty($v5['o_note'])){
+            $orderInfo .= '备注：'.$v5['o_note'].'<BR>';
+        }
+        @$nums += $prices;
+    }
+//    $time = date('Y-m-d H:i:s', time());
+    $orderInfo .= '--------------------------------<BR>';
+    if ($arr[0]['box_money'] > 0) {
+        $kw5 = '';
+        $len = 24 - strlen($arr[0]['box_money']);
+        for ($q = 0; $q < $len; $q++) {
+            $kw5 .= ' ';
+        }
+        $orderInfo .= '包装费：' . $kw5 . $arr[0]['box_money'] . '<BR>';
+    }
+    if($arr[0]['dada_fee'] > 0){
+        $kw5 = '';
+        $len = 24 - strlen($arr[0]['dada_fee']);
+        for ($q = 0; $q < $len; $q++) {
+            $kw5 .= ' ';
+        }
+        $orderInfo .= '配送费：'.$kw5.$arr[0]['dada_fee'].'<BR>';
+    }
+    if($arr[0]['yhq_money2'] > 0){
+        $yhq_money2 = sprintf("%.2f",$arr[0]['yhq_money2']);
+        $kw6 = '';
+        $len = 25 - strlen($yhq_money2);
+        for ($q = 0; $q < $len; $q++) {
+            $kw6 .= ' ';
+        }
+        $orderInfo .= '红包：'.$kw6.'-'.$yhq_money2.'<BR>';
+    }
+    $total = '合计：'.$arr[0]['m_money'];
+    $user_name = $arr[0]['user_name'];
+    if(strlen($user_name)>18){
+        $user_name=substr($user_name,0,18).'...';
+    }
+    $str = $user_name . $total;
+    $kw5 = '';
+    $lenght = iconv("UTF-8", "GBK//IGNORE", $str);
+    $total_len = 32 - strlen($lenght);
+    for ($q = 0; $q < $total_len; $q++) {
+        $kw5 .= ' ';
+    }
+    $total_str = $user_name.$kw5.$total;
+    $orderInfo .= $total_str.'<BR>';
+    $orderInfo .= '送货地点：' . $arr[0]['address'] . '<BR>';
+    $tel = substr_replace( $arr[0]['tel'], '****', 3, 4);
+    $orderInfo .= '联系电话：' . $tel . '<BR>';
+    $orderInfo .= '配送时间：' . $arr[0]['ps_time'] . '<BR>';
+    if(!empty($arr[0]['note'])){
+        $orderInfo .= '备注：'.$arr[0]['note'].'<BR><BR>';
+    }
+    //$orderInfo .= '<QR>http://www.feieyun.com</QR>';//把解析后的二维码生成的字符串用标签套上即可自动生成二维码
+    return $orderInfo;
+}
+
+?>
diff --git a/app/Libs/feier_print/httpclient.php b/app/Libs/feier_print/httpclient.php
new file mode 100644
index 0000000..4f691ef
--- /dev/null
+++ b/app/Libs/feier_print/httpclient.php
@@ -0,0 +1,307 @@
+<?php
+
+class HttpClient {
+    // Request vars
+    var $host;
+    var $port;
+    var $path;
+    var $method;
+    var $postdata = '';
+    var $cookies = array();
+    var $referer;
+    var $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+    var $accept_encoding = 'gzip';
+    var $accept_language = 'en-us';
+    var $user_agent = 'Incutio HttpClient v0.9';
+    var $timeout = 20;
+    var $use_gzip = true;
+    var $persist_cookies = true; 
+    var $persist_referers = true; 
+    var $debug = false;
+    var $handle_redirects = true; 
+    var $max_redirects = 5;
+    var $headers_only = false;    
+    var $username;
+    var $password;
+    var $status;
+    var $headers = array();
+    var $content = '';
+    var $errormsg;
+    var $redirect_count = 0;
+    var $cookie_host = '';
+    function __construct($host, $port=80) {
+        $this->host = $host;
+        $this->port = $port;
+    }
+    function get($path, $data = false) {
+        $this->path = $path;
+        $this->method = 'GET';
+        if ($data) {
+            $this->path .= '?'.$this->buildQueryString($data);
+        }
+        return $this->doRequest();
+    }
+    function post($path, $data) {
+        $this->path = $path;
+        $this->method = 'POST';
+        $this->postdata = $this->buildQueryString($data);
+        return $this->doRequest();
+    }
+    function buildQueryString($data) {
+        $querystring = '';
+        if (is_array($data)) {
+            foreach ($data as $key => $val) {
+                if (is_array($val)) {
+                    foreach ($val as $val2) {
+                        $querystring .= urlencode($key).'='.urlencode($val2).'&';
+                    }
+                } else {
+                    $querystring .= urlencode($key).'='.urlencode($val).'&';
+                }
+            }
+            $querystring = substr($querystring, 0, -1); // Eliminate unnecessary &
+        } else {
+            $querystring = $data;
+        }
+        return $querystring;
+    }
+    function doRequest() {
+        if (!$fp = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout)) {
+            switch($errno) {
+                case -3:
+                    $this->errormsg = 'Socket creation failed (-3)';
+                case -4:
+                    $this->errormsg = 'DNS lookup failure (-4)';
+                case -5:
+                    $this->errormsg = 'Connection refused or timed out (-5)';
+                default:
+                    $this->errormsg = 'Connection failed ('.$errno.')';
+                $this->errormsg .= ' '.$errstr;
+                $this->debug($this->errormsg);
+            }
+            return false;
+        }
+        socket_set_timeout($fp, $this->timeout);
+        $request = $this->buildRequest();
+        $this->debug('Request', $request);
+        fwrite($fp, $request);
+        $this->headers = array();
+        $this->content = '';
+        $this->errormsg = '';
+        $inHeaders = true;
+        $atStart = true;
+        while (!feof($fp)) {
+            $line = fgets($fp, 4096);
+            if ($atStart) {
+                $atStart = false;
+                if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
+                    $this->errormsg = "Status code line invalid: ".htmlentities($line);
+                    $this->debug($this->errormsg);
+                    return false;
+                }
+                $http_version = $m[1]; 
+                $this->status = $m[2];
+                $status_string = $m[3];
+                $this->debug(trim($line));
+                continue;
+            }
+            if ($inHeaders) {
+                if (trim($line) == '') {
+                    $inHeaders = false;
+                    $this->debug('Received Headers', $this->headers);
+                    if ($this->headers_only) {
+                        break;
+                    }
+                    continue;
+                }
+                if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
+                    continue;
+                }
+                $key = strtolower(trim($m[1]));
+                $val = trim($m[2]);
+                if (isset($this->headers[$key])) {
+                    if (is_array($this->headers[$key])) {
+                        $this->headers[$key][] = $val;
+                    } else {
+                        $this->headers[$key] = array($this->headers[$key], $val);
+                    }
+                } else {
+                    $this->headers[$key] = $val;
+                }
+                continue;
+            }
+            $this->content .= $line;
+        }
+        fclose($fp);
+        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip') {
+            $this->debug('Content is gzip encoded, unzipping it');
+            $this->content = substr($this->content, 10);
+            $this->content = gzinflate($this->content);
+        }
+        if ($this->persist_cookies && isset($this->headers['set-cookie']) && $this->host == $this->cookie_host) {
+            $cookies = $this->headers['set-cookie'];
+            if (!is_array($cookies)) {
+                $cookies = array($cookies);
+            }
+            foreach ($cookies as $cookie) {
+                if (preg_match('/([^=]+)=([^;]+);/', $cookie, $m)) {
+                    $this->cookies[$m[1]] = $m[2];
+                }
+            }
+            $this->cookie_host = $this->host;
+        }
+        if ($this->persist_referers) {
+            $this->debug('Persisting referer: '.$this->getRequestURL());
+            $this->referer = $this->getRequestURL();
+        }
+        if ($this->handle_redirects) {
+            if (++$this->redirect_count >= $this->max_redirects) {
+                $this->errormsg = 'Number of redirects exceeded maximum ('.$this->max_redirects.')';
+                $this->debug($this->errormsg);
+                $this->redirect_count = 0;
+                return false;
+            }
+            $location = isset($this->headers['location']) ? $this->headers['location'] : '';
+            $uri = isset($this->headers['uri']) ? $this->headers['uri'] : '';
+            if ($location || $uri) {
+                $url = parse_url($location.$uri);
+                return $this->get($url['path']);
+            }
+        }
+        return true;
+    }
+    function buildRequest() {
+        $headers = array();
+        $headers[] = "{$this->method} {$this->path} HTTP/1.0"; 
+        $headers[] = "Host: {$this->host}";
+        $headers[] = "User-Agent: {$this->user_agent}";
+        $headers[] = "Accept: {$this->accept}";
+        if ($this->use_gzip) {
+            $headers[] = "Accept-encoding: {$this->accept_encoding}";
+        }
+        $headers[] = "Accept-language: {$this->accept_language}";
+        if ($this->referer) {
+            $headers[] = "Referer: {$this->referer}";
+        }
+        if ($this->cookies) {
+            $cookie = 'Cookie: ';
+            foreach ($this->cookies as $key => $value) {
+                $cookie .= "$key=$value; ";
+            }
+            $headers[] = $cookie;
+        }
+        if ($this->username && $this->password) {
+            $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
+        }
+        if ($this->postdata) {
+            $headers[] = 'Content-Type: application/x-www-form-urlencoded';
+            $headers[] = 'Content-Length: '.strlen($this->postdata);
+        }
+        $request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
+        return $request;
+    }
+    function getStatus() {
+        return $this->status;
+    }
+    function getContent() {
+        return $this->content;
+    }
+    function getHeaders() {
+        return $this->headers;
+    }
+    function getHeader($header) {
+        $header = strtolower($header);
+        if (isset($this->headers[$header])) {
+            return $this->headers[$header];
+        } else {
+            return false;
+        }
+    }
+    function getError() {
+        return $this->errormsg;
+    }
+    function getCookies() {
+        return $this->cookies;
+    }
+    function getRequestURL() {
+        $url = 'https://'.$this->host;
+        if ($this->port != 80) {
+            $url .= ':'.$this->port;
+        }            
+        $url .= $this->path;
+        return $url;
+    }
+    function setUserAgent($string) {
+        $this->user_agent = $string;
+    }
+    function setAuthorization($username, $password) {
+        $this->username = $username;
+        $this->password = $password;
+    }
+    function setCookies($array) {
+        $this->cookies = $array;
+    }
+    function useGzip($boolean) {
+        $this->use_gzip = $boolean;
+    }
+    function setPersistCookies($boolean) {
+        $this->persist_cookies = $boolean;
+    }
+    function setPersistReferers($boolean) {
+        $this->persist_referers = $boolean;
+    }
+    function setHandleRedirects($boolean) {
+        $this->handle_redirects = $boolean;
+    }
+    function setMaxRedirects($num) {
+        $this->max_redirects = $num;
+    }
+    function setHeadersOnly($boolean) {
+        $this->headers_only = $boolean;
+    }
+    function setDebug($boolean) {
+        $this->debug = $boolean;
+    }
+    function quickGet($url) {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        if (isset($bits['query'])) {
+            $path .= '?'.$bits['query'];
+        }
+        $client = new HttpClient($host, $port);
+        if (!$client->get($path)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    function quickPost($url, $data) {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        $client = new HttpClient($host, $port);
+        if (!$client->post($path, $data)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    function debug($msg, $object = false) {
+        if ($this->debug) {
+            print '<div style="border: 1px solid red; padding: 0.5em; margin: 0.5em;"><strong>HttpClient Debug:</strong> '.$msg;
+            if ($object) {
+                ob_start();
+                print_r($object);
+                $content = htmlentities(ob_get_contents());
+                ob_end_clean();
+                print '<pre>'.$content.'</pre>';
+            }
+            print '</div>';
+        }
+    }   
+}
+
+?>
\ No newline at end of file
diff --git a/app/Libs/feier_print/飞鹅云打印说明文档.txt b/app/Libs/feier_print/飞鹅云打印说明文档.txt
new file mode 100644
index 0000000..4fecb48
--- /dev/null
+++ b/app/Libs/feier_print/飞鹅云打印说明文档.txt
@@ -0,0 +1,46 @@
+一、添加打印机
+	
+	方法名	printerContent($content）
+	
+	参数说明	$content 打印机编号(必填) # 打印机识别码(必填) # 备注名称(选填) # 流量卡号码(选填)，多台打印机请换行（\n）添加新打印机信息，每次最多100台
+		如：316500010 # abcdefgh # 快餐前台 # 13688889999
+    		       316500011 # abcdefgh # 快餐厨房 # 13688889990		
+二、删除打印机
+
+	方法名	printerDelList($snlist)
+	
+	参数说明	$snlist 打印机编号 多台用-连接
+		如：316500010-316500011 		
+三、打印订单
+
+	方法名	printMsg($sn,$content,$times)
+	
+	参数说明	$sn 打印机编码  	$content 打印内容 	$times 打印张数 无值默认为1
+		如：         $sn = 550510805;
+			$content = '<CB>测试打印</CB><BR>';
+  			$content .= '名称　　　　　 单价  数量 金额<BR>';
+  			$content .= '--------------------------------<BR>';
+  			$content .= '饭　　　　　 　10.0   10  100.0<BR>';
+  			$content .= '炒饭　　　　　 10.0   10  100.0<BR>';
+  			$content .= '蛋炒饭　　　　 10.0   10  100.0<BR>';
+ 			 $content .= '鸡蛋炒饭　　　 10.0   10  100.0<BR>';
+  			$content .= '西红柿炒饭　　 10.0   10  100.0<BR>';
+  			$content .= '西红柿蛋炒饭　 10.0   10  100.0<BR>';
+ 			 $content .= '西红柿鸡蛋炒饭 10.0   10  100.0<BR>';
+  			$content .= '--------------------------------<BR>';
+  			$content .= '备注：加辣<BR>';
+  			$content .= '合计：xx.0元<BR>';
+ 			 $content .= '送货地点：广西南宁五象新区<BR>';
+  			$content .= '联系电话：13888888888888<BR>';
+  			$content .= '订餐时间：2014-08-08 08:08:08<BR>';
+  			$content .= '<QR>http://www.feieyun.com</QR>';//把二维码字符串用标签套上即可自动生成二维码
+  			//标签说明：
+  			$content = "<DIRECTION>1</DIRECTION>";//设定打印时出纸和打印字体的方向，n 0 或 1，每次设备重启后都会初始化为 0 值设置，1：正向出纸，0：反向出纸，
+  			$content .= "<TEXT x='9' y='10' font='12' w='1' h='2' r='0'>#001       五号桌      1/3</TEXT><TEXT x='80' y='80' font='12' w='2' h='2' r='0'>可乐鸡翅</TEXT><TEXT x='9' y='180' font='12' w='1' h='1' r='0'>张三先生       13800138000</TEXT>";//40mm宽度标签纸打印例子，打开注释调用标签打印接口打印
+			
+四、查询订单状态	
+
+	方法名	queryOrderState($orderid)
+	
+	参数说明	$orderid	飞鹅订单号（发起打印请求成功时，从回调的参数中获取）
+		如：550510805_20200603103522_387054119	
\ No newline at end of file
diff --git a/app/Models/ImsCjdcMarket.php b/app/Models/ImsCjdcMarket.php
index 1496a8c..ca35ebb 100644
--- a/app/Models/ImsCjdcMarket.php
+++ b/app/Models/ImsCjdcMarket.php
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class ImsCjdcMarket extends Model
 {
-	use HasDateTimeFormatter;
+    use HasDateTimeFormatter;
     use SoftDeletes;
 
     protected $table = 'ims_cjdc_market';
@@ -29,6 +29,18 @@ class ImsCjdcMarket extends Model
         return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id');
     }
 
-
+    /**
+     * 获取市场信息
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public static function getMarket()
+    {
+        $markets = self::get();
+        $item         = [];
+        foreach ($markets as $market) {
+            $item[$market->id]   = $market->name;
+        }
+        return $item;
+    }
 
 }
diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php
index 76ad925..661354b 100644
--- a/app/Models/ImsCjdcOrderMain.php
+++ b/app/Models/ImsCjdcOrderMain.php
@@ -55,5 +55,8 @@ class ImsCjdcOrderMain extends Model
 
     }
 
-
+    public function updateShippingType($oid,$type)
+    {
+        return self::where('id',$oid)->update(['order_shipping_code'=>$type]);
+    }
 }
diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php
index 74ad9f0..38017bc 100644
--- a/app/Models/LanzuServiceHorseman.php
+++ b/app/Models/LanzuServiceHorseman.php
@@ -12,5 +12,5 @@ class LanzuServiceHorseman extends Model
     use SoftDeletes;
 
     protected $table = 'lanzu_service_horseman';
-    
+    protected $dateFormat = 'U';
 }

From 319b09ac4ecf4c399861c1d60832aa42db42aa63 Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Thu, 3 Sep 2020 10:18:10 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=89=93=E5=8D=B0,=E9=9C=80=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8hyperf=E6=89=93=E5=8D=B0api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Extensions/OrderPrint.php | 39 +++++++++++++++++++++++++++++
 app/Models/Feprint.php              | 14 +++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 app/Models/Feprint.php

diff --git a/app/Admin/Extensions/OrderPrint.php b/app/Admin/Extensions/OrderPrint.php
index d813fd1..2af1e85 100644
--- a/app/Admin/Extensions/OrderPrint.php
+++ b/app/Admin/Extensions/OrderPrint.php
@@ -4,6 +4,8 @@
 namespace App\Admin\Extensions;
 
 
+use App\Models\Feprint;
+use App\Models\ImsCjdcOrderMain;
 use Dcat\Admin\Grid\RowAction;
 use Illuminate\Http\Request;
 
@@ -19,6 +21,7 @@ class OrderPrint extends RowAction
     public function handle(Request $request)
     {
         $id = $this->getKey();
+        $this->doPrint();
         dd($id);
     }
 
@@ -31,4 +34,40 @@ class OrderPrint extends RowAction
     {
 
     }
+
+    public function doPrint()
+    {
+        $oid = $this->getKey();
+        $row = ImsCjdcOrderMain::find($oid);
+
+        //>>1.获取打印机状态
+        $result = $this->getPrintStatus($row->market_id);
+        //>>2.调用打印
+        if ($result==1){
+            $this->feiErPrint($row->order_num);
+        }
+        //>>3.记录打印次数
+    }
+
+    /**
+     * @param $oid  //主订单ID
+     * @return int
+     */
+    public function getPrintStatus($mid)
+    {
+        $fe = Feprint::where('market_id',$mid)->first();
+        if ($fe){
+            return  $fe->status;
+        }else{
+            return -1;
+        }
+    }
+
+    public function feiErPrint($order_num)
+    {
+
+        include_once app_path('Libs\feier_print\api_php_demo.php');
+        $result = json_decode(FeiePrint($order_num));
+        dd($result);
+    }
 }
diff --git a/app/Models/Feprint.php b/app/Models/Feprint.php
new file mode 100644
index 0000000..56dd942
--- /dev/null
+++ b/app/Models/Feprint.php
@@ -0,0 +1,14 @@
+<?php
+
+
+namespace App\Models;
+
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\Model;
+
+class Feprint extends Model
+{
+    use HasDateTimeFormatter;
+    protected $table = 'ims_cjdc_feprint';
+}

From 2d1c1abaabd95387b7119dcd51fa8effe8a7c65e Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Thu, 3 Sep 2020 14:42:52 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=87=AA=E9=80=81=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImsCjdcOrderMainController.php            | 35 +++++++-
 app/Admin/Extensions/CheckRow.php             | 51 +++--------
 app/Admin/Extensions/OrderPrint.php           |  1 -
 app/Admin/Extensions/OrderStateHandle.php     | 16 +++-
 app/Libs/feier_print/api_php_demo.php         |  2 +-
 composer.lock                                 | 89 ++-----------------
 6 files changed, 67 insertions(+), 127 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index a40ba17..6433eed 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -2,9 +2,12 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Extensions\CheckRow;
+use App\Admin\Extensions\CouponTieEdit;
 use App\Admin\Extensions\OrderDetail;
 use App\Admin\Extensions\OrderPrint;
 use App\Admin\Extensions\OrderStateHandle;
+use App\Admin\Forms\CouponTieForm;
 use App\Admin\Repositories\ImsCjdcOrderMain;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
@@ -41,8 +44,34 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->column('market.name','所属市场');
             $grid->time;
             $grid->pay_time;
-            $grid->actions(function (Grid\Displayers\Actions $actions) {
+
+            $grid->actions(new CheckRow('自送'));
+
+            $grid->column('配送方式')
+                ->if(function ($column){
+                    if ($this->state==3){
+                        return true;
+                    }
+                    return false;
+
+                })
+                ->display('站内自送')
+                ->modal('站内自送',function ($modal){
+                    return CouponTieForm::make();
+                })
+                ->else()
+                ->display('站内自送');
+
+
+
+
+            $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid){
                 $state = $actions->row->state;
+
+
+
+
+
                 if ($state==2){
                     $actions->append(new OrderStateHandle('接单',3));
                     $actions->append(new OrderPrint('打印'));
@@ -83,7 +112,9 @@ class ImsCjdcOrderMainController extends AdminController
 
 
 
-
+            $grid->disableViewButton();
+            $grid->disableEditButton();
+            $grid->disableDeleteButton();
 
 
 
diff --git a/app/Admin/Extensions/CheckRow.php b/app/Admin/Extensions/CheckRow.php
index eb43473..1c2cf65 100644
--- a/app/Admin/Extensions/CheckRow.php
+++ b/app/Admin/Extensions/CheckRow.php
@@ -1,59 +1,32 @@
 <?php
 namespace App\Admin\Extensions;
 
+use App\Admin\Forms\CouponTieForm;
 use App\Models\ImsCjdcOrderMain;
 use App\Models\StoreAccount;
 use Dcat\Admin\Grid\RowAction;
+use Dcat\Admin\Widgets\Modal;
 use Illuminate\Http\Request;
 
 class CheckRow extends RowAction
 {
 
-    protected $model;
-    protected $state;
     protected $title;
-    public function __construct($title=null,$state=null)
+    public function __construct($title=null)
     {
-
         parent::__construct($title);
-        $this->state = $state;
-
-    }
-
-
-    /**
-     * 处理请求
-     *
-     * @param Request $request
-     *
-     * @return \Dcat\Admin\Actions\Response
-     */
-    public function handle(Request $request)
-    {
-        // 获取当前行ID
-        $id = $this->getKey();
-        $orderMain = new ImsCjdcOrderMain();
-        $state = $request->get('state');
-        $res = $orderMain->modifyState($id,$state);
-        if ($res==true){
-            return $this->response()->success('操作成功')->refresh();
-        }else{
-            return $this->response()->error('操作失败');
-        }
-
-
 
     }
 
-    /**
-     * 设置要POST到接口的数据
-     *
-     * @return array
-     */
-    public function parameters()
+    public function render()
     {
-        return [
-            'state' => $this->state,
-        ];
+        // 实例化表单类并传递自定义参数
+        $form = CouponTieForm::make();
+
+        return Modal::make()
+            ->lg()
+            ->title($this->title)
+            ->body($form)
+            ->button($this->title);
     }
 }
diff --git a/app/Admin/Extensions/OrderPrint.php b/app/Admin/Extensions/OrderPrint.php
index 2af1e85..0ecd573 100644
--- a/app/Admin/Extensions/OrderPrint.php
+++ b/app/Admin/Extensions/OrderPrint.php
@@ -65,7 +65,6 @@ class OrderPrint extends RowAction
 
     public function feiErPrint($order_num)
     {
-
         include_once app_path('Libs\feier_print\api_php_demo.php');
         $result = json_decode(FeiePrint($order_num));
         dd($result);
diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php
index 5e34e39..c653c23 100644
--- a/app/Admin/Extensions/OrderStateHandle.php
+++ b/app/Admin/Extensions/OrderStateHandle.php
@@ -2,7 +2,9 @@
 namespace App\Admin\Extensions;
 
 use App\Models\ImsCjdcOrderMain;
+use Dcat\Admin\Grid\Displayers\Modal;
 use Dcat\Admin\Grid\RowAction;
+use Dcat\Admin\Layout\Content;
 use Illuminate\Http\Request;
 
 class OrderStateHandle extends RowAction
@@ -11,6 +13,7 @@ class OrderStateHandle extends RowAction
     protected $model;
     protected $state;
     protected $title;
+    protected $content;
     public function __construct($title=null,$state=null)
     {
 
@@ -20,6 +23,7 @@ class OrderStateHandle extends RowAction
     }
 
 
+
     /**
      * 处理请求
      *
@@ -34,7 +38,12 @@ class OrderStateHandle extends RowAction
         $orderMain = new ImsCjdcOrderMain();
         $state = $request->get('state');
         if ($state==30){
-            $res = $orderMain->updateShippingType($id,1);
+            $content = new Content();
+             $content = $this->showForm($content);
+            return $content;
+
+            dd('弹出表单');
+            //$res = $orderMain->updateShippingType($id,1);
         }elseif ($state==100){
 
         }else{
@@ -59,4 +68,9 @@ class OrderStateHandle extends RowAction
             'state' => $this->state,
         ];
     }
+
+    public function showForm(Content $content)
+    {
+        return $content->title('站内自送')->body("<h1>hello world!</h1>");
+    }
 }
diff --git a/app/Libs/feier_print/api_php_demo.php b/app/Libs/feier_print/api_php_demo.php
index 916993a..4b8611c 100644
--- a/app/Libs/feier_print/api_php_demo.php
+++ b/app/Libs/feier_print/api_php_demo.php
@@ -150,7 +150,7 @@ function signature($time)
 
 function FeiePrint($order_num)
 {
-    $data = Db::table('ims_cjdc_order_main')
+    $data = DB::table('ims_cjdc_order_main')
         ->alias('m')
         ->join(['ims_cjdc_order'=>'o'],'o.order_main_id = m.id','inner')
         ->join(['ims_cjdc_order_goods'=>'g'],'o.id = g.order_id','inner')
diff --git a/composer.lock b/composer.lock
index d8f4dbc..14a912f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -165,16 +165,16 @@
         },
         {
             "name": "dcat/laravel-admin",
-            "version": "1.6.5",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jqhph/dcat-admin.git",
-                "reference": "684ea3da59a6caa8f00771781b7ff50d18759b81"
+                "reference": "b2694de229a9fd52f9ab048870d4e93b8ee7a505"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/684ea3da59a6caa8f00771781b7ff50d18759b81",
-                "reference": "684ea3da59a6caa8f00771781b7ff50d18759b81",
+                "url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/b2694de229a9fd52f9ab048870d4e93b8ee7a505",
+                "reference": "b2694de229a9fd52f9ab048870d4e93b8ee7a505",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -233,7 +233,7 @@
                 "laravel",
                 "laravel admin"
             ],
-            "time": "2020-07-28T03:26:18+00:00"
+            "time": "2020-09-02T13:19:24+00:00"
         },
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -2131,12 +2131,6 @@
                 "wechat",
                 "weibo"
             ],
-            "funding": [
-                {
-                    "url": "https://www.patreon.com/overtrue",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-03-04T15:22:25+00:00"
         },
         {
@@ -2210,20 +2204,6 @@
                 "weixin",
                 "weixin-sdk"
             ],
-            "funding": [
-                {
-                    "url": "https://www.easywechat.com/img/pay/wechat.jpg",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/overtrue",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/overtrue",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-07-29T07:36:50+00:00"
         },
         {
@@ -3203,20 +3183,6 @@
                 "caching",
                 "psr6"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-23T17:22:30+00:00"
         },
         {
@@ -3285,20 +3251,6 @@
                 "interoperability",
                 "standards"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-06T13:23:11+00:00"
         },
         {
@@ -4898,20 +4850,6 @@
                 "psr-17",
                 "psr-7"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-06-25T08:21:47+00:00"
         },
         {
@@ -5441,20 +5379,6 @@
                 "instantiate",
                 "serialize"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-06-07T15:42:22+00:00"
         },
         {
@@ -7865,6 +7789,5 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

From 549e2322de3c10c361693e52675bb01263dbc287 Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Mon, 7 Sep 2020 08:52:38 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore    | 1 +
 composer.lock | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index ff712e7..d3b01e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
+/public/vendors
 /storage/*.key
 /vendor
 .env
diff --git a/composer.lock b/composer.lock
index 14a912f..655bd1c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6826,6 +6826,7 @@
             "keywords": [
                 "tokenizer"
             ],
+            "abandoned": true,
             "time": "2019-09-17T06:23:10+00:00"
         },
         {

From 1bbc14ee818f66fd4551b69ea66577bbc5120551 Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Mon, 7 Sep 2020 09:56:59 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/SelectHorseman.php          | 47 +++++++++++++++++++++
 app/Admin/Repositories/ImsCjdcOrderMain.php |  8 ++--
 app/Models/ImsCjdcOrder.php                 |  2 +-
 app/Models/ImsCjdcOrderMain.php             |  3 +-
 4 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 app/Admin/Forms/SelectHorseman.php

diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php
new file mode 100644
index 0000000..dfd49ee
--- /dev/null
+++ b/app/Admin/Forms/SelectHorseman.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Admin\Forms;
+
+use Dcat\Admin\Widgets\Form;
+use Symfony\Component\HttpFoundation\Response;
+
+class SelectHorseman extends Form
+{
+    /**
+     * Handle the form request.
+     *
+     * @param array $input
+     *
+     * @return Response
+     */
+    public function handle(array $input)
+    {
+        // dump($input);
+
+        // return $this->error('Your error message.');
+
+        return $this->success('Processed successfully.', '/');
+    }
+
+    /**
+     * Build a form here.
+     */
+    public function form()
+    {
+        $this->text('name')->required();
+        $this->email('email')->rules('email');
+    }
+
+    /**
+     * The data of the form.
+     *
+     * @return array
+     */
+    public function default()
+    {
+        return [
+            'name'  => 'John Doe',
+            'email' => 'John.Doe@gmail.com',
+        ];
+    }
+}
diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php
index 97349dc..1005792 100644
--- a/app/Admin/Repositories/ImsCjdcOrderMain.php
+++ b/app/Admin/Repositories/ImsCjdcOrderMain.php
@@ -18,11 +18,11 @@ class ImsCjdcOrderMain extends EloquentRepository
     public function get(Grid\Model $model)
     {
         $builder = new \App\Models\ImsCjdcOrderMain();
-        $builder = $builder::leftJoin('ims_cjdc_user as u','u.id','ims_cjdc_order_main.user_id')
+        $builder = $builder::leftJoin('ims_cjdc_user as u','u.id','lanzu_order_main.user_id')
             ->with('market')
-            ->select('ims_cjdc_order_main.*','u.name as user_name')
+            ->select('lanzu_order_main.*','u.name as user_name')
             ->where('type',1)
-            ->orderBy('ims_cjdc_order_main.id','desc');//只取线上订单数据
+            ->orderBy('lanzu_order_main.id','desc');//只取线上订单数据
 
         $this->setSort($model);
         $this->setPaginate($model);
@@ -40,7 +40,7 @@ class ImsCjdcOrderMain extends EloquentRepository
         $query = $query->toArray();
         //如果订单状态为配送中 将state设置为31
         foreach ($query['data'] as &$value){
-            if ($value['state']==3&&$value['order_shipping_code']==1){
+            if ($value['state']==3&&$value['shipping_type']==1){
                 $value['state'] = 31;
             }
         }
diff --git a/app/Models/ImsCjdcOrder.php b/app/Models/ImsCjdcOrder.php
index bc1a2ec..a88180f 100644
--- a/app/Models/ImsCjdcOrder.php
+++ b/app/Models/ImsCjdcOrder.php
@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 class ImsCjdcOrder extends Model
 {
 	use HasDateTimeFormatter;
-    protected $table = 'ims_cjdc_order as order';
+    protected $table = 'lanzu_order as order';
     public $timestamps = false;
 
     public function user()
diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php
index 661354b..c54c904 100644
--- a/app/Models/ImsCjdcOrderMain.php
+++ b/app/Models/ImsCjdcOrderMain.php
@@ -10,7 +10,8 @@ use Illuminate\Support\Facades\DB;
 class ImsCjdcOrderMain extends Model
 {
 	use HasDateTimeFormatter;
-    protected $table = 'ims_cjdc_order_main';
+    //protected $table = 'ims_cjdc_order_main';
+    protected $table = 'lanzu_order_main';
     public $timestamps = false;
 
     public function imsCjdcUser()