update

application/index/controller/Cabinet.php

@@ -236,7 +236,9 @@ class Cabinet extends Base
 
     public function BoxList(){
         $cabinet_number = input('cabinet_number');
-
+        if(empty($cabinet_number)){
+            json_error(1007 , '柜子号码不能为空');
+        }
         $BoxModel = new BoxModel();
         $where['cabinet_number'] = $cabinet_number;
         $selectResult = $BoxModel->getBoxsByWhere($where);
@@ -251,6 +253,9 @@ class Cabinet extends Base
     }
     public function BoxActionList(){
         $param = input('param.');
+        if(empty($param['cabinet_number']) || empty($param['box_number'])){
+            json_error(1007 , '柜子号码或箱子号码不能为空');
+        }
         $where['cabinet_number'] = $param['cabinet_number'];
         $where['box_number'] = $param['box_number'];
         $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;

application/index/controller/Order.php

@@ -26,6 +26,10 @@ class Order extends Base
         $order_sn   = input('param.order_sn');
         $trunk      = input('param.trunk');
         $cabinet    = input('param.cabinet');
+        $checkNumber = $this->CheckNumber($cabinet , $trunk);
+        if($checkNumber == false){
+            json_error(2005);
+        }
         $ret = $this->CreateOrderBindBox($order_sn , $trunk , $cabinet);
         if($ret['code'] != 1){
             json_error(1006);
@@ -88,6 +92,16 @@ class Order extends Base
         json_success($return);
     }
 
+    private function CheckNumber($cabinet_number , $box_number){
+        $BoxModel = new BoxModel();
+        $box = $BoxModel->getOneCabinetBox($cabinet_number , $box_number);
+        if($box['box_status'] == 1){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
 
     /**
      * 生成订单并绑定箱子

config/errorCode.php

@@ -21,4 +21,5 @@ return [
     '2002'  =>  '订单不存在',
     '2003'  =>  '取件码无效',
     '2004'  =>  '箱子不存在',
+    '2005'  =>  '箱子已被使用',
 ];