一些功能

app/models/store/StoreExchangeOrder.php

@@ -41,21 +41,21 @@ class StoreExchangeOrder extends BaseModel
         } else {
             $model = $model->order('a.id desc');
         }
-        return ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()->each(function ($v){
-                $v['nickname'] = User::where('uid', $v['uid'])->value('nickname');
-                $v['giftnickname'] = User::where('uid', $v['gift_uid'])->value('nickname');
-                $v['status_name'] = $v['status'] == 1 ? "已使用" : "未使用";
-                $_info = StoreOrderCartInfo::where('cart_id', $v['cart_id'])->field('cart_info')->select();
-                $_info = count($_info) ? $_info->toArray() : [];
-                foreach ($_info as $k => $vv) {
-                    $cart_info = $vv['cart_info'];
-                    if (!isset($cart_info['productInfo'])) $cart_info['productInfo'] = [];
-                    $_info[$k]['cart_info'] = $cart_info;
-                    unset($cart_info);
-                }
-                $v['_info'] = $_info;
-                $v['store'] = SystemStore::where('id', $v['store_id'])->value('name') ?: '--';
-                $v['add_time'] = $v['add_time'] ? date('Y-m-d H:i:s', $v['add_time']) : '';
+        return ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()->each(function ($v) {
+            $v['nickname'] = User::where('uid', $v['uid'])->value('nickname');
+            $v['giftnickname'] = User::where('uid', $v['gift_uid'])->value('nickname');
+            $v['status_name'] = $v['status'] == 1 ? "已使用" : "未使用";
+            $_info = StoreOrderCartInfo::where('cart_id', $v['cart_id'])->field('cart_info')->select();
+            $_info = count($_info) ? $_info->toArray() : [];
+            foreach ($_info as $k => $vv) {
+                $cart_info = $vv['cart_info'];
+                if (!isset($cart_info['productInfo'])) $cart_info['productInfo'] = [];
+                $_info[$k]['cart_info'] = $cart_info;
+                unset($cart_info);
+            }
+            $v['_info'] = $_info;
+            $v['store'] = SystemStore::where('id', $v['store_id'])->value('name') ?: '--';
+            $v['add_time'] = $v['add_time'] ? date('Y-m-d H:i:s', $v['add_time']) : '';
         })) && count($data) ? $data->toArray() : [];
     }
 
@@ -93,9 +93,9 @@ class StoreExchangeOrder extends BaseModel
         if (isset($where['status']) && $where['status'] != '') $model = self::statusWhere($where['status'], $model, $aler);
         if (isset($where['store_id']) && $where['store_id'] != '' && $where['store_id'] != -1) $model = $model->where($aler . 'store_id', $where['store_id']);
         if (isset($where['user_phone']) && $where['user_phone'] != '')
-            $model = $model->where($aler . 'user_phone', 'LIKE', "%$where[user_phone]%");
+            $model = $model->where($join . 'phone', 'LIKE', "%$where[user_phone]%");
         if (isset($where['real_name']) && $where['real_name'] != '')
-            $model = $model->where($aler . 'order_id|' . $aler . 'real_name|' . $aler . 'user_phone' . ($join ? '|' . $join . '.nickname|' . $join . '.uid' : ''), 'LIKE', "%$where[real_name]%");
+            $model = $model->where($aler . 'order_id|' . $join . 'phone' . ($join ? '|' . $join . '.nickname|' . $join . '.uid' : ''), 'LIKE', "%$where[real_name]%");
         if (isset($where['data']) && $where['data'] !== '')
             $model = self::getModelTime($where, $model, $aler . 'add_time');
         return $model;