update

application/index/controller/Base.php

@@ -7,7 +7,7 @@ class Base extends Controller{
     const redis_host = 'lredis';
     const redis_port = 6379;
     const queue_name = 'net_access_queue';
-    private $no_check = ['order/checkorder' , 'order/recordstore' , 'order/checkfcode' , 'order/recordfetch'];
+    private $no_check = ['order/checkorder' , 'order/recordstore' , 'order/checkfcode' , 'order/recordfetch' , 'cabinet/getcabinetsboxs' , 'cabinet/boxchangestatus'];
 
     public function initialize(){
         $control = lcfirst(request()->controller());

application/index/controller/Cabinet.php

@@ -27,32 +27,6 @@ class Cabinet extends Base
     }
 
     /**
-     * 检查取件码
-     */
-    public function CheckFcode(){
-        $code = input('param.code');
-        $OrderModel = new OrderModel();
-        $result = $OrderModel->check_fcode($code);
-        if($result['code'] != 1){
-            return json(json_error_exception('1009'));
-        }
-        json_success($result['data']);
-    }
-    /**
-     * 自提柜向服务器上报用户取走商品。
-    */
-    public function record_fetch(){
-        $trunk      = input('param.trunk');
-        $cabinet    = input('param.cabinet');
-        $state      = input('param.state');
-
-        $result = $this->change_status($cabinet , $trunk , $state);
-        if($result['code'] != 1){
-            json_error(1006);
-        }
-        json_success('');
-    }
-    /**
      * 自提柜批量生产
     */
     public function AddCabinet(){
@@ -91,7 +65,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
-        $params['cabinet_code']       = $cabinet['number'];
+        $params['cabinet_code']       = $cabinet['cabinet_code'];
         $params['method']             = 'OpenBoxR';
 
         $result = $this->proc_request(self::queue_name,'OpenBox',$params);
@@ -117,7 +91,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
-        $params['cabinet_code']       = $cabinet['number'];
+        $params['cabinet_code']       = $cabinet['cabinet_code'];
         $params['method']             = 'LockCabinetR';
 
         $result = $this->proc_request(self::queue_name,'LockCabinet',$params);
@@ -142,7 +116,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
-        $params['cabinet_code']       = $cabinet['number'];
+        $params['cabinet_code']       = $cabinet['cabinet_code'];
         $params['method']             = 'UnLockCabinetR';
 
         $result = $this->proc_request(self::queue_name,'UnLockCabinet',$params);
@@ -167,7 +141,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
-        $params['cabinet_code']       = $cabinet['number'];
+        $params['cabinet_code']       = $cabinet['cabinet_code'];
         $params['method']             = 'ReleaseAlarmR';
 
         $result = $this->proc_request(self::queue_name,'ReleaseAlarm',$params);
@@ -192,7 +166,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
-        $params['cabinet_code']       = $cabinet['number'];
+        $params['cabinet_code']       = $cabinet['cabinet_code'];
         $params['method']             = 'RebootR';
 
         $result = $this->proc_request(self::queue_name,'Reboot',$params);
@@ -217,7 +191,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
-        $params['cabinet_code']       = $cabinet['number'];
+        $params['cabinet_code']       = $cabinet['cabinet_code'];
         $params['method']             = 'RebootR';
 
         $result = $this->proc_request(self::queue_name,'QueryState',$params);
@@ -243,7 +217,7 @@ class Cabinet extends Base
     }
 
     public function BoxList(){
-        $cabinet_number = input('cabinet_number');
+        $cabinet_number = input('param.cabinet_number');
         if(empty($cabinet_number)){
             json_error(1007 , '柜子号码不能为空');
         }
@@ -282,6 +256,31 @@ class Cabinet extends Base
         json_success($return);
     }
 
+    public function GetCabinetsBoxs(){
+        echo 1;die;
+        $CabinetModel = new CabinetModel();
+        $cabinets = $CabinetModel->getCabinetsByWhere();
+        $BoxModel = new BoxModel();
+        foreach ($cabinets as $key => $value){
+            $cabinets[$key]['box_data'] = $BoxModel->getBoxNumbers(['cabinet_number' => $value['id']]);
+        }
+        json_success($cabinets);
+    }
+
+    public function BoxChangeStatus(){
+        $cabinet_number = input('param.cabinet_number');
+        $box_number = input('param.box_number');
+        $box_status = input('param.box_status');
+        $ret = $this->ChangeStatus($cabinet_number , $box_number , $box_status);
+        if($ret['code'] == -1){
+            json_error(1008 , $ret['msg']);
+        }
+        if($ret == false){
+            json_error(1006);
+        }
+        json_success([]);
+    }
+
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     private function proc_request($queue_name, $key, $params){
@@ -326,14 +325,14 @@ class Cabinet extends Base
     /**
      * 自提柜箱子修改状态
      */
-    private function change_status($cabinet_number , $box_number , $status){
+    private function ChangeStatus($cabinet_number , $box_number , $status){
         $BoxModel = new BoxModel();
         $box = $BoxModel->getOneCabinetBox($cabinet_number,$box_number);
-        if(empty($cabinet)){
-            json_error(1008);
+        if(empty($box)){
+            return msg(-1, '', '箱子不存在');
         }
-        if($status == $cabinet['status']){
-            return msg(1, '', 'success');
+        if($status == $box['box_status']){
+            return true;
         }
         $where['cabinet_number']    = $cabinet_number;
         $where['box_number']        = $box_number;

application/index/model/BoxModel.php

@@ -62,4 +62,14 @@ class BoxModel extends Model {
     {
         return $this->count();
     }
+
+    /**
+     * 根据搜索条件获取箱子列表信息
+     * @param $offset
+     * @param $limit
+     */
+    public function getBoxNumbers($where)
+    {
+        return $this->where($where)->order('box_number asc')->field('box_number')->select();
+    }
 }

application/index/model/CabinetModel.php

@@ -19,7 +19,7 @@ class CabinetModel extends Model{
         try
         {
             $this->startTrans();
-            $result = $this->save(['req_url' => $url,'alias' => $alias,'box_count' => $count,'number' => $number,'login_key' => $login_key]);
+            $result = $this->save(['req_url' => $url,'alias' => $alias,'box_count' => $count,'cabinet_code' => $number,'login_key' => $login_key]);
             if(false === $result){
                 $this->rollback();
                 return msg(-1, '', $this->getError());

route/route.php

@@ -25,4 +25,7 @@
         'BoxList'                   => 'index/cabinet/BoxList',
         'BoxActionList'             => 'index/cabinet/BoxActionList',
         'OrderList'                 => 'index/order/OrderList',
+
+        'GetCabinetsBoxs'           => 'index/cabinet/GetCabinetsBoxs',
+        'BoxChangeStatus'           => 'index/cabinet/BoxChangeStatus',
     ));