goods

application/admin/controller/LogisticsCompany.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 物流公司管理
+ *
+ * @icon fa fa-circle-o
+ */
+class LogisticsCompany extends Backend
+{
+    protected $noNeedRight=['index'];
+    /**
+     * LogisticsCompany模型对象
+     * @var \app\admin\model\LogisticsCompany
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\LogisticsCompany;
+
+    }
+
+    public function import()
+    {
+        parent::import();
+    }
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = false;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $limit=1000000;
+            $list = $this->model
+                    
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                $row->visible(['id','name','no']);
+                
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

application/admin/controller/Orders.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use app\common\model\OrderLogistics;
 
 /**
  * 
@@ -76,17 +77,18 @@ class Orders extends Backend
         $order=$this->model->find($ids);
         if($this->request->isGet()){
             $this->assign('row',$order);
+            $this->assign('companys',\app\common\model\LogisticsCompany::all());
             return $this->fetch();
         }else{
             $data=input('row/a');
             $this->validate($data,[
                 'com_id'=>['require',],
-                'transfer_no'=>['require'],
+                'trans_no'=>['require'],
             ]);
-            if($order->logistics){
+            /*if($order->logistics){
                 $this->error('已发货无法再次发货');
-            }
-            $order->makeSend($data);
+            }*/
+            $order->makeSend($order->logistics,$data);
             $this->success();
         }
     }

application/admin/lang/zh-cn/logistics_company.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'Name' => '公司名称',
+    'No'   => '公司编号'
+];

application/admin/model/LogisticsCompany.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class LogisticsCompany extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'logistics_company';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+}

application/admin/validate/LogisticsCompany.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class LogisticsCompany extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/logistics_company/add.html

@@ -0,0 +1,22 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" class="form-control" name="row[name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-no" class="form-control" name="row[no]" type="text">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/logistics_company/edit.html

@@ -0,0 +1,22 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-no" class="form-control" name="row[no]" type="text" value="{$row.no|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/logistics_company/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('logistics_company/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('logistics_company/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('logistics_company/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('logistics_company/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+
+                        <div class="dropdown btn-group {:$auth->check('logistics_company/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('logistics_company/edit')}" 
+                           data-operate-del="{:$auth->check('logistics_company/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/orders/send.html

@@ -1,117 +1,25 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('物流公司')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-status" min="0" class="form-control" name="row[status]" type="number" value="0">
+            <input
+                    id="c-name"
+                    data-rule=""
+                    data-params='{}'
+                    data-source='{:json_encode($companys)}'
+                    class="form-control selectpage"
+                    name="row[com_id]"
+                    data-multiple="false"
+                    type="text"
+                    data-pagination="false"
+                    value="{$row.logistics.com_id|default=''}"
+            >
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('物流单号')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" class="form-control" name="row[order_no]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_total')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_total" min="0" class="form-control" step="0.01" name="row[amount_total]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_pay')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_pay" min="0" class="form-control" step="0.01" name="row[amount_pay]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_install')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_install" min="0" class="form-control" step="0.01" name="row[amount_install]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_coupon')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_coupon" min="0" class="form-control" step="0.01" name="row[amount_coupon]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_coupon_kill')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_coupon_kill" min="0" class="form-control" step="0.01" name="row[amount_coupon_kill]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_discount')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_discount" min="0" class="form-control" step="0.01" name="row[amount_discount]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-num" min="0" class="form-control" name="row[num]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Num_install')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-num_install" min="0" class="form-control" name="row[num_install]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_type" min="0" class="form-control" name="row[pay_type]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pay_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cancel_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cancel_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Rec_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-rec_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[rec_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Continue_expire_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-continue_expire_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[continue_expire_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Tax')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-tax" class="form-control" name="row[tax]" type="text">
+            <input id="c-user_id" data-rule="required" data-field="nickname" class="form-control" name="row[trans_no]" type="text" value="{$row.logistics.trans_no|default=''}">
         </div>
     </div>
     <div class="form-group layer-footer">

application/api/controller/object/Index.php

@@ -72,6 +72,7 @@ class Index extends Api
      * @ApiParams (name=cancel_time,description=取消时间)
      * @ApiParams (name=pay_time,description=支付时间)
      * @ApiParams (name=rec_time,description=收货时间)
+     * @ApiParams (name=send_time,description=发货时间)
      * @ApiParams (name=pay_type,description=支付方式1企业网银2微信3支付宝4银联5代付6线下支付)
      * @ApiParams (name=continue_expire_time,description=过期时间)
      * @ApiParams (name=status,description="状态：0待支付5待发货10待收货20已完成30已取消40退款退货")

application/common/model/Orders.php

@@ -3,6 +3,7 @@
 namespace app\common\model;
 
 use think\Model;
+use Yansongda\Supports\Arr;
 
 /**
  * @property OrderInfo info
@@ -141,10 +142,16 @@ class Orders extends Model
         return true;
     }
     #发货
-    public function makeSend($data){
-        $this->logistics()->save($data);
-        $this['status']=self::S_WAIT_REC;
-        $this->save();
+    public function makeSend($logistics,$data){
+        $newData=Arr::only($data,['com_id','trans_no']);
+        if(!$logistics) {
+            $this->logistics()->save($newData);
+            $this['status']=self::S_WAIT_REC;
+            $this['send_time']=time();
+            $this->save();
+        }else{
+            $logistics->save($newData);
+        }
     }
 
 

public/api.html

@@ -6815,6 +6815,12 @@
                                                         <td>收货时间</td>
                                                     </tr>
                                                                                                         <tr>
+                                                        <td>send_time</td>
+                                                        <td>string</td>
+                                                        <td>是</td>
+                                                        <td>发货时间</td>
+                                                    </tr>
+                                                                                                        <tr>
                                                         <td>pay_type</td>
                                                         <td>string</td>
                                                         <td>是</td>
@@ -7091,6 +7097,10 @@
                                                             <input type="string" class="form-control input-sm" id="rec_time" required placeholder="收货时间" name="rec_time">
                                                         </div>
                                                                                                                 <div class="form-group">
+                                                            <label class="control-label" for="send_time">send_time</label>
+                                                            <input type="string" class="form-control input-sm" id="send_time" required placeholder="发货时间" name="send_time">
+                                                        </div>
+                                                                                                                <div class="form-group">
                                                             <label class="control-label" for="pay_type">pay_type</label>
                                                             <input type="string" class="form-control input-sm" id="pay_type" required placeholder="支付方式1企业网银2微信3支付宝4银联5代付6线下支付" name="pay_type">
                                                         </div>
@@ -11450,7 +11460,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2022-09-27 10:23:49 <a href="./" target="_blank">后台管理</a>
+                    Generated on 2022-09-27 11:17:18 <a href="./" target="_blank">后台管理</a>
                 </div>
             </div>
 

public/assets/js/backend/logistics_company.js

@@ -0,0 +1,52 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'logistics_company/index' + location.search,
+                    add_url: 'logistics_company/add',
+                    edit_url: 'logistics_company/edit',
+                    del_url: 'logistics_company/del',
+                    multi_url: 'logistics_company/multi',
+                    import_url: 'logistics_company/import',
+                    table: 'logistics_company',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'name', title: __('Name')},
+                        {field: 'no', title: __('No')},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/orders.js

@@ -68,7 +68,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         add: function () {
             Controller.api.bindevent();
         },
-        edit: function () {
+        send: function () {
             Controller.api.bindevent();
         },
         api: {