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

application/common.php

@@ -175,6 +175,25 @@ function request_post($url = '', $postData = []) {
     curl_close($ch);
     return $data;
 }
+
+function http_post_json($url, $jsonStr)
+{
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_POST, 1);
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $jsonStr);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+            'Content-Type: application/json; charset=utf-8',
+            'Content-Length: ' . strlen($jsonStr)
+        )
+    );
+    $response = curl_exec($ch);
+    $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    curl_close($ch);
+
+    return $response;
+}
 /**
  * 统一返回信息
  * @param $code

application/index/controller/Order.php

@@ -21,11 +21,12 @@ class Order extends Base
         //3,其余返回正确。
 
         //商网接口
-        $result = request_post(self::base_url . '/check' , ['orderCode' => $order_sn]);
+        $postData['orderCode'] = $order_sn;
+        $postData = json_encode($postData);
+        $result = http_post_json(self::base_url . '/check' , $postData);
         if($result == false){
             json_error(3000);
         }
-
         $result = json_decode($result,true);
         if(!empty($result) && $result['code'] == 0) {
             $existed = $result['data']['isEffective'] != 0;
@@ -49,9 +50,8 @@ class Order extends Base
         $cabinet_number = $cabinet['id'];
         $checkNumber = $this->hasBox($cabinet_number , $trunk);
         if($checkNumber == false){
-            json_error(2005);
+            json_error(2004);
         }
-
         $code = $this->createRandCode();
         $ret  = $this->CreateOrder($order_sn , $trunk , $cabinet_number,$code);
 
@@ -63,16 +63,20 @@ class Order extends Base
             $this->box_action_record($cabinet_number , $trunk , 1 , $order_sn , $alias);
 
             $msg = "{$alias}柜门{$trunk}箱门，密码信息{$code}";
-            $result = request_post(self::base_url . '/deliver' , ['orderCode' => $order_sn,"boxMsg" => $msg]);
+            $postData['orderCode'] = $order_sn;
+            $postData['boxMsg'] = $msg;
+            $postData = json_encode($postData);
+            $result = http_post_json(self::base_url . '/deliver' , $postData);
             if($result == false){
                 json_error(3000);
             }
+            $result = json_decode($result,true);
             if($result['code'] != 0){
                 json_return($result['code'] , [] , $result['message']);
             }
 
             $this->CreateMsg($cabinet_number,$trunk,$msg,$order_sn,1);
-            json_success($result['data']);
+            json_success([]);
         }
     }
 
@@ -114,7 +118,12 @@ class Order extends Base
         $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']]);
+        $postData['orderCode'] = $order_sn;
+        $postData = json_encode($postData);
+        $result = http_post_json(self::base_url . '/receive' , $postData);
+        if($result == false){
+            json_error(3000);
+        }
         $result = json_decode($result,true);
         if($result['code'] != 0){
             json_return($result['code'] , [] , $result['message']);
@@ -123,7 +132,7 @@ class Order extends Base
         $msg = "{$cabinet['alias']}柜门{$trunk}箱门";
         $this->CreateMsg($cabinet_number,$trunk,$msg,$order_sn,2);
         $this->box_action_record($cabinet_number , $trunk , 2 , $cabinet ,$cabinet['alias']);
-        json_success($result['data']);
+        json_success([]);
     }
 
     public function OrderList(){
@@ -163,7 +172,8 @@ class Order extends Base
         $msg = "{$alias}柜门{$box_number}箱门，密码信息{$code}";
         $postData['orderCode'] = $order_sn;
         $postData['boxMsg'] = $msg;
-        $result = request_post(self::base_url . '/deliver' , $postData);
+        $postData = json_encode($postData);
+        $result = http_post_json(self::base_url . '/deliver' , $postData);
         if($result == false){
             json_error(3000);
         }