update

application/index/controller/Cabinet.php

@@ -224,7 +224,7 @@ class Cabinet extends Base
         $BoxModel = new BoxModel();
         $where['sc_box.cabinet_number'] = $cabinet_number;
         $selectResult = $BoxModel->getBoxsByWhere($where);
-        $box_status = ['1' => '空闲' , '2' => '已使用' , '3' => '锁定中'];
+        $box_status = ['打开','关闭'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['status_text'] = $box_status[$vo['box_status']];
@@ -271,6 +271,7 @@ class Cabinet extends Base
         $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']);
         }
@@ -344,19 +345,6 @@ class Cabinet extends Base
     }
 
     /**
-     * 自提柜箱子绑定订单号
-     */
-    private function box_bind_order($cabinet_number , $box_number , $order_sn){
-        $where['cabinet_number']    = $cabinet_number;
-        $where['box_number']        = $box_number;
-        $update['order_sn']         = $order_sn;
-        $update['box_status']       = 2;
-
-        $BoxModel = new BoxModel();
-        return  $BoxModel->editData($where,$update);
-    }
-
-    /**
      * 记录箱子开启/关闭
     */
     private function box_action_record($cabinet_number , $box_number , $type){

application/index/controller/Order.php

@@ -14,9 +14,14 @@ class Order extends Base
     public function CheckOrder(){
         $order_sn = input('param.order_sn');
         //商网接口
-//        $result = request_post(self::base_url . '/deliver.do' , ['order_sn' => $order_sn]);
-//        pre($result);
-        json_success();
+        $result = request_post(self::base_url . '/deliver' , ['order_code' => $order_sn]);
+        if($result == false){
+            json_error(3000);
+        }
+        if($result['code'] != 0){
+            json_return($result['code'] , $result['data'] , $result['message']);
+        }
+        json_success($result['data']);
     }
 
     /**

application/index/model/OrderModel.php

@@ -28,7 +28,7 @@ class OrderModel extends Model{
                 return msg(-1, '', $this->getError());
             }else{
                 $BoxModel = new BoxModel();
-                $ret = $BoxModel->save(['order_sn' => $params['order_sn'] , 'box_status' => 2] , ['cabinet_number' => $params['cabinet_number'] , 'box_number' => $params['box_number']]);
+                $ret = $BoxModel->save(['order_sn' => $params['order_sn'] , 'box_status' => 1] , ['cabinet_number' => $params['cabinet_number'] , 'box_number' => $params['box_number']]);
                 if($ret === false){
                     return msg(-1, '', $this->getError());
                 }else{
@@ -69,7 +69,7 @@ class OrderModel extends Model{
     public function check_fcode($code)
     {
         $where['sc_order.code'] = $code;
-        $where['BoxModel.box_status'] = 2;
+        $where['BoxModel.box_status'] = 1;
         try{
             $order = $this->Box()->hasWhere($where)->find();
             if(empty($order)){

config/errorCode.php

@@ -22,4 +22,6 @@ return [
     '2003'  =>  '取件码无效',
     '2004'  =>  '箱子不存在',
     '2005'  =>  '箱子已被使用',
+
+    '3000'  =>  '商网通信失败',
 ];