for test

application/index/controller/Order.php

@@ -68,6 +68,8 @@ class Order extends Base
 
     public function CheckFcode(){
         $code = input('param.code');
+//        $cabinet_code = input('param.cabinet');
+
         $BoxModel = new BoxModel();
         $box = $BoxModel->CheckCode($code);
         if(empty($box)){
@@ -78,7 +80,9 @@ class Order extends Base
         $data['code'] = $code;
         $data['existed'] = true;
         $data['trunk'] = $box['box_number'];
-        $data['cabinet'] = $box['cabinet_number'];
+        $cabinet = CabinetModel::where('id',$box['cabinet_number'])->find();
+        $data['cabinet'] = $cabinet['cabinet_code'];
+
         json_success($data);
     }
 
@@ -92,12 +96,17 @@ class Order extends Base
         if(empty($Box)){
             json_error(2004);
         }
-        $ret = $BoxModel->editData(['cabinet_number' => $cabinet_number , 'box_number' => $trunk] , ['order_sn' => '' , 'box_status' => 1]);
+        $ret = $BoxModel->editData(['cabinet_number' => $cabinet_number , 'box_number' => $trunk] ,
+            ['order_sn' => '' , 'box_status' => 1, 'fetch_code' => '']);
         if($ret['code'] != 1){
             json_error(1006);
         }
         $OrderModel = new OrderModel();
         $OrderModel->editData(['order_sn' => $Box['order_sn']] , ['order_status' => 2 , 'out_time' => date("Y-m-d H:i:s")]);
+        $order_sn = $Box['order_sn'];
+        $result = request_post(self::base_url . '/receive' , ['orderCode' => $Box['order_sn']]);
+        //todo 存消息
+
         $this->box_action_record($cabinet_number , $trunk , 2 , $cabinet ,$cabinet['alias']);
         json_success();
     }