cabinet update

application/index/controller/Cabinet.php

@@ -55,7 +55,7 @@ class Cabinet extends Base
 
         $result = $this->change_status($cabinet , $trunk , $state);
         if($result['code'] != 1){
-            return json(json_error_exception('1006'));
+            json_error(1006);
         }
         json_success('');
     }
@@ -77,7 +77,7 @@ class Cabinet extends Base
         if($flag['code'] != 1){
             return json(json_error_exception('1006',$flag['msg']));
         }
-        json_success([],'success');
+        json_success([]);
     }
 
     /**
@@ -101,16 +101,14 @@ class Cabinet extends Base
         $params['key']                = $cabinet['login_key'];
         $params['method']             = 'OpenBoxR';
 
-
         $result = $this->proc_request(self::queue_name,'OpenBox',$params);
-    }
-    public function OpenBoxR($params){
-        if($params['code'] == 0){
-            $this->box_action_record($params['cabinet_code'] , $params['box_position_list'][0] , 1);
-        }else{
-            json_error(2000,$params['msg']);
+        if($result == false) {
+            json_error(2000);
+        } else {
+            json_success($result);
         }
     }
+
     /**
      * 关闭箱门
      */
@@ -137,13 +135,8 @@ class Cabinet extends Base
     private function proc_request($queue_name, $key, $params){
         QueueClient::push($queue_name,self::redis_host , self::redis_port ,$key,$params);
         [$method,$args] = $this->wait_result($params['ret_queue']);
-
-        if($method && $args) {
-            return $this->$method($args);
-        }
-        else {
-            return json(json_error_exception('2000'));
-        }
+        Log::record($args);
+        return $args;
     }
 
     private function getid(){
@@ -155,15 +148,13 @@ class Cabinet extends Base
     */
     private function wait_result($queue_name)
     {
-
         $worker = new QueueServer($queue_name,self::redis_host , self::redis_port);
         $queues = $worker->scan();
 
         try
         {
             $content = $worker->pop($queues, 10);
-            if(is_array($content))
-            {
+            if(is_array($content)) {
                 $method = key($content);
                 $arg = current($content);
 
@@ -189,7 +180,7 @@ class Cabinet extends Base
         $BoxModel = new BoxModel();
         $box = $BoxModel->getOneCabinetBox($cabinet_number,$box_number);
         if(empty($cabinet)){
-            return json(json_error_exception(1008));
+            json_error(1008);
         }
         if($status == $cabinet['status']){
             return msg(1, '', 'success');