Merge branch 'test' of 39.97.239.116:gyfl/apisongcan into test

application/index/controller/Order.php

@@ -141,18 +141,25 @@ class Order extends Base
         $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
         $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
         $offset = ($param['pageNumber'] - 1) * $limit;
-
+        if(!empty($param['order_sn'])){
+            $where['order_sn'] = $param['order_sn'];
+        }else{
+            $where = [];
+        }
         $OrderModel = new OrderModel();
-        $selectResult = $OrderModel->getOrdersByWhere($offset, $limit);
+        $selectResult = $OrderModel->getOrdersByWhere($where,$offset, $limit);
         $order_status = ['1' => '已存入' , '2' => '已取走'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['order_status'] = $order_status[$vo['order_status']];
+            $selectResult[$key]['enter_time'] = date("m-d H:i",strtotime($vo['enter_time']));
             if($vo['out_time'] == null){
                 $selectResult[$key]['out_time'] = '';
+            }else{
+                $selectResult[$key]['out_time'] = date("m-d H:i",strtotime($vo['out_time']));
             }
         }
-        $return['total'] = $OrderModel->getAllCounts();  //总数量
+        $return['total'] = $OrderModel->getAllCounts($where);  //总数量
         $return['rows'] = $selectResult;
         json_success($return);
     }

application/index/controller/User.php

@@ -24,7 +24,7 @@ class User extends Base{
         $selectResult = $user->getUsersByWhere($where, $offset, $limit);
 
         $status = ['1' => '启用' , '2' => '禁用'];
-
+        $uid = session('id');
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['status_text'] = $status[$vo['status']];
@@ -34,6 +34,11 @@ class User extends Base{
             if($vo['update_timestamp'] == null){
                 $selectResult[$key]['update_timestamp'] = '';
             }
+            if($vo['id'] == $uid){
+                $selectResult[$key]['is_del'] = false;
+            }else{
+                $selectResult[$key]['is_del'] = true;
+            }
         }
 
         $return['total'] = $user->getAllUsers($where);  //总数据

application/index/model/OrderModel.php

@@ -89,16 +89,16 @@ class OrderModel extends Model{
      * @param $offset
      * @param $limit
      */
-    public function getOrdersByWhere( $offset, $limit)
+    public function getOrdersByWhere($where, $offset, $limit)
     {
-        return $this->limit($offset, $limit)->order('id desc')->select();
+        return $this->where($where)->limit($offset, $limit)->order('id desc')->select();
     }
 
     /**
      * 根据搜索条件获取所有的箱子数量
      */
-    public function getAllCounts()
+    public function getAllCounts($where)
     {
-        return $this->count();
+        return $this->where($where)->count();
     }
 }