Merge branch 'test' of 39.97.239.116:gyfl/apisongcan into test

application/index/controller/Order.php

@@ -153,9 +153,9 @@ class Order extends Base
     */
     private function createRandCode(){
         $code = rand(100000,999999);
-        $OrderModel = new OrderModel();
-        $order = $OrderModel->where('code',$code)->find();
-        if(!empty($order)){
+        $BoxModel = new BoxModel();
+        $box = $BoxModel->where('code',$code)->find();
+        if(!empty($box)){
             $this->createRandCode();
         }
         return $code;

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' => 1] , ['cabinet_number' => $params['cabinet_number'] , 'box_number' => $params['box_number']]);
+                $ret = $BoxModel->save(['order_sn' => $params['order_sn'] , 'fetch_code' => $params['code'] , 'box_status' => 1] , ['cabinet_number' => $params['cabinet_number'] , 'box_number' => $params['box_number']]);
                 if($ret === false){
                     return msg(-1, '', $this->getError());
                 }else{