add api ManualSave and api order date where

application/index/controller/Order.php

@@ -137,10 +137,47 @@ class Order extends Base
         if($result['code'] != 0){
             json_return($result['code'] , [] , $result['message']);
         }
-        //todo 存消息
+        // 存消息
         $msg = "{$cabinet['alias']}柜门{$trunk}箱门";
         $this->CreateMsg($cabinet_number,$trunk,$msg,$order_sn,2);
-        $this->box_action_record($cabinet_number , $trunk , 2 , $cabinet ,$cabinet['alias']);
+        $this->box_action_record($cabinet_number , $trunk , 2 , $order_sn ,$cabinet['alias']);
+        json_success([]);
+    }
+
+    public function ManualSave(){
+        $order_sn   = input('param.order_sn');
+        $box_number = input('param.box_number');
+        $cabinet_number = input('param.cabinet_number');
+        $BoxModel = new BoxModel();
+        $box = $BoxModel->where(['cabinet_number' => $cabinet_number , 'box_number' => $box_number , 'order_sn' => $order_sn])->find();
+        if(empty($box)){
+            json_error(2004);
+        }
+        $cabinet = CabinetModel::where('id',$cabinet_number)->find();
+        $ret = $BoxModel->editData(['cabinet_number' => $cabinet_number , 'box_number' => $box_number] ,
+            ['order_sn' => '' , 'box_status' => 1, 'fetch_code' => '']);
+        if($ret['code'] != 1){
+            json_error(1006);
+        }
+        $OrderModel = new OrderModel();
+        $OrderModel->editData(['order_sn' => $order_sn] , ['order_status' => 2 , 'out_time' => date("Y-m-d H:i:s")]);
+        $postData['orderCode'] = $order_sn;
+        $postData = json_encode($postData);
+        $result = http_post_json(self::base_url . '/receive' , $postData);
+        if($result == false){
+            Log::record('ManualSave Error:'.$result);
+            json_error(3000);
+        }
+        Log::record('ManualSave Success:');
+        Log::record($result);
+        $result = json_decode($result,true);
+        if($result['code'] != 0){
+            json_return($result['code'] , [] , $result['message']);
+        }
+        // 存消息
+        $msg = "{$cabinet['alias']}柜门{$box_number}箱门";
+        $this->CreateMsg($cabinet_number,$box_number,$msg,$order_sn,2);
+        $this->box_action_record($cabinet_number , $box_number , 2 , $order_sn ,$cabinet['alias']);
         json_success([]);
     }
 
@@ -150,13 +187,20 @@ class Order extends Base
         $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
         $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
         $offset = ($param['pageNumber'] - 1) * $limit;
+        $where = $TimeWhere = [];
         if(!empty($param['order_sn'])){
             $where['sc_order.order_sn'] = $param['order_sn'];
-        }else{
-            $where = [];
+        }
+        if(!empty($param['start_time']) && !empty($param['end_time'])){
+            if($param['start_time'] > $param['end_time'] || strtotime($param['end_time']) > time()){
+                json_error(1007,'日期有误');
+            }
+            $start_time = $param['start_time'];
+            $end_time = $param['end_time'];
+            $TimeWhere[] = ['enter_time','between',"$start_time,$end_time"];
         }
         $OrderModel = new OrderModel();
-        $selectResult = $OrderModel->getOrdersByWhere($where,$offset, $limit);
+        $selectResult = $OrderModel->getOrdersByWhere($where,$offset, $limit,$TimeWhere);
         $order_status = ['1' => '已存入' , '2' => '已取走'];
         $CabinetModel = new CabinetModel();
         // 拼装参数
@@ -183,7 +227,7 @@ class Order extends Base
 
         $box = BoxModel::where(['cabinet_number' => $cabinet_number , 'box_number' => $box_number , 'order_sn' => $order_sn])->find();
         if(empty($box)){
-            json_error(2004);
+            json_error(2002);
         }
         $cabinet = CabinetModel::find($cabinet_number);
         $alias = $cabinet['alias'];

application/index/model/OrderModel.php

@@ -93,9 +93,9 @@ class OrderModel extends Model{
      * @param $offset
      * @param $limit
      */
-    public function getOrdersByWhere($where, $offset, $limit)
+    public function getOrdersByWhere($where, $offset, $limit , $TimeWhere)
     {
-        return $this->where($where)->limit($offset, $limit)->order('id desc')->select();
+        return $this->where($where)->where($TimeWhere)->limit($offset, $limit)->order('id desc')->select();
     }
 
     /**

route/route.php

@@ -1,38 +1,39 @@
-<?php
-    Route::group('/',array(
-        'Login'                     => 'index/login/Login',
-        'LoginOut'                  => 'index/login/LoginOut',
-        'UserAdd'                   => 'index/user/UserAdd',
-        'UserList'                  => 'index/user/UserList',
-        'UserDel'                   => 'index/user/UserDel',
-        'EditPwd'                   => 'index/user/EditPwd',
-
-        'AddCabinet'                => 'index/cabinet/AddCabinet',
-        'DelCabinet'                => 'index/cabinet/DelCabinet',
-        'AddBox'                    => 'index/cabinet/AddBox',
-
-        'OpenBox'                   => 'index/cabinet/OpenBox',
-        'LockCabinet'               => 'index/cabinet/LockCabinet',
-        'UnLockCabinet'             => 'index/cabinet/UnLockCabinet',
-        'ReleaseAlarm'              => 'index/cabinet/ReleaseAlarm',
-        'Reboot'                    => 'index/cabinet/Reboot',
-        'QueryState'                => 'index/cabinet/QueryState',
-
-        'CheckOrder'                => 'index/order/CheckOrder',
-        'RecordStore'               => 'index/order/RecordStore',
-        'CheckFcode'                => 'index/order/CheckFcode',
-        'RecordFetch'               => 'index/order/RecordFetch',
-
-
-        'CabinetList'               => 'index/cabinet/CabinetList',
-        'BoxList'                   => 'index/cabinet/BoxList',
-        'MsgList'                   => 'index/cabinet/MsgList',
-        'BoxActionList'             => 'index/cabinet/BoxActionList',
-        'ActionLogList'             => 'index/cabinet/ActionLogList',
-        'OrderList'                 => 'index/order/OrderList',
-        'SendMsg'                   => 'index/order/SendMsg',
-
-        'GetCabinetsBoxs'           => 'index/cabinet/GetCabinetsBoxs',
-        'BoxChangeStatus'           => 'index/cabinet/BoxChangeStatus',
-
+<?php
+    Route::group('/',array(
+        'Login'                     => 'index/login/Login',
+        'LoginOut'                  => 'index/login/LoginOut',
+        'UserAdd'                   => 'index/user/UserAdd',
+        'UserList'                  => 'index/user/UserList',
+        'UserDel'                   => 'index/user/UserDel',
+        'EditPwd'                   => 'index/user/EditPwd',
+
+        'AddCabinet'                => 'index/cabinet/AddCabinet',
+        'DelCabinet'                => 'index/cabinet/DelCabinet',
+        'AddBox'                    => 'index/cabinet/AddBox',
+
+        'OpenBox'                   => 'index/cabinet/OpenBox',
+        'LockCabinet'               => 'index/cabinet/LockCabinet',
+        'UnLockCabinet'             => 'index/cabinet/UnLockCabinet',
+        'ReleaseAlarm'              => 'index/cabinet/ReleaseAlarm',
+        'Reboot'                    => 'index/cabinet/Reboot',
+        'QueryState'                => 'index/cabinet/QueryState',
+
+        'CheckOrder'                => 'index/order/CheckOrder',
+        'RecordStore'               => 'index/order/RecordStore',
+        'CheckFcode'                => 'index/order/CheckFcode',
+        'RecordFetch'               => 'index/order/RecordFetch',
+
+
+        'CabinetList'               => 'index/cabinet/CabinetList',
+        'BoxList'                   => 'index/cabinet/BoxList',
+        'MsgList'                   => 'index/cabinet/MsgList',
+        'BoxActionList'             => 'index/cabinet/BoxActionList',
+        'ActionLogList'             => 'index/cabinet/ActionLogList',
+        'OrderList'                 => 'index/order/OrderList',
+        'SendMsg'                   => 'index/order/SendMsg',
+        'ManualSave'                => 'index/order/ManualSave',
+
+        'GetCabinetsBoxs'           => 'index/cabinet/GetCabinetsBoxs',
+        'BoxChangeStatus'           => 'index/cabinet/BoxChangeStatus',
+
     ));