Browse Source

订单搜索

lizhen 1 day ago
parent
commit
7023e3ea08

+ 6 - 13
application/admin/controller/unishop/Order.php

@@ -64,8 +64,7 @@ class Order extends Backend
 
             $total = $this->model
                 ->alias('order')
-                ->join('user', 'user.id = order.user_id','LEFT')
-                ->join('user intro', 'intro.id = order.intro_uid','LEFT')
+                ->join('user usera', 'usera.id = order.user_id','LEFT')
                 ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->where($where)
@@ -75,8 +74,7 @@ class Order extends Backend
 
             $sum_price = $this->model
                 ->alias('order')
-                ->join('user', 'user.id = order.user_id','LEFT')
-                ->join('user intro', 'intro.id = order.intro_uid','LEFT')
+                ->join('user usera', 'usera.id = order.user_id','LEFT')
                 ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->where($where)
@@ -86,8 +84,7 @@ class Order extends Backend
 
             $list = $this->model
                 ->alias('order')
-                ->join('user', 'user.id = order.user_id','LEFT')
-                ->join('user intro', 'intro.id = order.intro_uid','LEFT')
+                ->join('user usera', 'usera.id = order.user_id','LEFT')
                 ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->where($where)
@@ -95,18 +92,14 @@ class Order extends Backend
                 ->where('order.have_paid','gt',0)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
-                ->field('order.*,user.nickname,intro.nickname as intro_nickname,intro.mobile as intro_mobile,hexiao.nickname as hexiao_nickname,hexiao.mobile as hexiao_mobile,op.product_id as op_product_id,op.title as op_title,op.number as op_number,op.spec as op_spec,op.price as op_price')
+                ->field('order.*,usera.nickname,hexiao.nickname as hexiao_nickname,hexiao.mobile as hexiao_mobile,op.product_id as op_product_id,op.title as op_title,op.number as op_number,op.spec as op_spec,op.price as op_price')
                 ->select();
 
             $list = collection($list)->toArray();
             foreach ($list as &$item) {
                 $item['id'] = (string)$item['id']; // 整形数字太大js会失准
-                $item['user'] = [];
-                $item['user']['nickname'] = $item['nickname'] ? $item['nickname'] : '';
-
-                $item['intro'] = [];
-                $item['intro']['nickname'] = $item['intro_nickname'] ? $item['intro_nickname'] : '';
-                $item['intro']['mobile']   = $item['intro_mobile']   ? $item['intro_mobile'] : '';
+                $item['usera'] = [];
+                $item['usera']['nickname'] = $item['nickname'] ? $item['nickname'] : '';
 
                 $item['hexiao'] = [];
                 $item['hexiao']['nickname'] = $item['hexiao_nickname'] ? $item['hexiao_nickname'] : '';

+ 7 - 9
public/assets/js/backend/unishop/order.js

@@ -99,18 +99,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
 //                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.nickname', title: __('User name')},
-                        // {field: 'intro.nickname', title: '推广人'},
-                        // {field: 'intro.mobile', title: '推广人手机'},
-                        {field: 'hexiao.nickname', title: '核销人'},
+                        {field: 'usera.nickname', title: '用户昵称',operate: 'LIKE'},
+                        {field: 'hexiao.nickname', title: '核销人昵称',operate: 'LIKE'},
                         // {field: 'hexiao.mobile', title: '核销人手机'},
-                        {field: 'out_trade_no', title: __('Out_trade_no')},
+                        {field: 'out_trade_no', title: __('Out_trade_no'),operate: 'LIKE'},
 
                         {field: 'op.product_id', title: '活动ID'},
-                        {field: 'op.title', title: '活动标题'},
+                        {field: 'op.title', title: '活动标题',operate: 'LIKE'},
                         // {field: 'op.spec', title: '商品规格'},
-                        {field: 'op.price', title: '活动单价'},
-                        {field: 'op.number', title: '报名人数'},
+                        {field: 'op.price', title: '活动单价',operate: false},
+                        {field: 'op.number', title: '报名人数',operate: false},
                         {field: 'book_realname', title: __('book_realname'),operate:'LIKE'},
                         {field: 'book_mobile', title: __('book_mobile'), operate:'LIKE'},
 
@@ -201,7 +199,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
 //                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.nickname', title: __('User name')},
+                        {field: 'usera.nickname', title: __('User name')},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},