后台订单

application/admin/controller/unishop/Order.php

@@ -53,24 +53,34 @@ class Order extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
                 ->alias('order')
-                ->join('user', 'user.id = order.user_id')
+                ->join('user', 'user.id = order.user_id','LEFT')
+                ->join('user intro', 'intro.id = order.intro_uid','LEFT')
+                ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->where($where)
                 ->count();
 
             $list = $this->model
                 ->alias('order')
-                ->join('user', 'user.id = order.user_id')
+                ->join('user', 'user.id = order.user_id','LEFT')
+                ->join('user intro', 'intro.id = order.intro_uid','LEFT')
+                ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->where($where)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
-                ->field('order.*,user.username')
+                ->field('order.*,user.username,intro.username as intro_username,hexiao.username as hexiao_username')
                 ->select();
 
             $list = collection($list)->toArray();
             foreach ($list as &$item) {
                 $item['id'] = (string)$item['id']; // 整形数字太大js会失准
                 $item['user'] = [];
-                $item['user']['username'] = $item['username'] ? $item['username'] : __('Tourist');
+                $item['user']['username'] = $item['username'] ? $item['username'] : '';
+
+                $item['intro'] = [];
+                $item['intro']['username'] = $item['intro_username'] ? $item['intro_username'] : '';
+
+                $item['hexiao'] = [];
+                $item['hexiao']['username'] = $item['hexiao_username'] ? $item['hexiao_username'] : '';
 
                 $item['have_paid_status'] = $item['have_paid'];
                 $item['have_delivered_status'] = $item['have_delivered'];

application/admin/lang/zh-cn/unishop/order.php

@@ -13,7 +13,7 @@ return [
     'wxPay'            => '微信付款',
     'aliPay'           => '支付宝付',
     'Ip'               => '下单ip',
-    'Remark'           => '订单备注',
+    'Remark'           => '买家留言',
     'Status'           => '订单状态',
     'Refund'        => '退货',
     'Cancel'         => '取消订单',
@@ -44,9 +44,9 @@ return [
     'Consignee address'           => '收货人地址',
     'Consignee name'           => '收货人名称',
     'Consignee mobile'           => '收货人电话',
-    'Refund status'           => '售后状态',
+    'Refund status'           => '退款状态',
     'Apply'           => '申请中',
-    'Pass'           => '通过',
+    'Pass'           => '退款',
     'Pass and left User delivery'           => '通过(让用户发货)',
     'Waiting for shipment'           => '等待发货',
     'Refuse'           => '拒绝',
@@ -54,4 +54,7 @@ return [
     'Withdraw money'           => '退款',
     'Not withdraw money'           => '不退款',
     'Tourist'           => '游客',
+    'booktime'           => '预约时间',
+    'book_realname'           => '预约姓名',
+    'book_mobile'           => '预约手机号',
 ];

application/admin/model/unishop/Order.php

@@ -83,6 +83,10 @@ class Order extends Model
         return $value === '' ? 0 : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
 
+    protected function setBooktimeAttr($value)
+    {
+        return $value === '' ? 0 : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
 
     /**
      * 关联用户

application/admin/view/unishop/order/edit.html

@@ -56,12 +56,7 @@
             <input id="c-ip" class="form-control" name="row[ip]" type="text" value="{$row.ip}">
         </div>
     </div>-->
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -75,7 +70,7 @@
         </div>
     </div>
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refund status')}:</label>
         <div class="col-xs-12 col-sm-8">
 
@@ -86,7 +81,7 @@
             </div>
 
         </div>
-    </div>
+    </div>-->
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay time')}:</label>
@@ -112,6 +107,32 @@
             <input id="c-have_received" disabled class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_received]" type="text" value="{:$row.have_received?datetime($row.have_received):''}">
         </div>
     </div>
+    <hr>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('booktime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-booktime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[booktime]" type="text" value="{:$row.booktime?datetime($row.booktime):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('book_realname')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-book_realname" class="form-control" name="row[book_realname]" type="text" value="{$row.book_realname}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('book_mobile')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-book_mobile" class="form-control" name="row[book_mobile]" type="text" value="{$row.book_mobile}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
+        </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">

public/assets/js/backend/unishop/order.js

@@ -84,12 +84,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns:true,
                 fixedRightNumber:1,
+                search:false,
+
                 columns: [
                     [
                         {checkbox: true},
 //                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User name')},
+                        {field: 'intro.username', title: '推广人'},
+                        {field: 'hexiao.username', title: '核销人'},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},