edit

app/Services/CommonService.php

@@ -1834,4 +1834,19 @@ class CommonService extends Service{
         $resp = file_get_contents($url, false, stream_context_create($arrContextOptions));
         return $resp;
     }
+    public static function https_request($url, $data = null)
+    {
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $url);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
+        if (!empty($data)) {
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+        }
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        $output = curl_exec($curl);
+        curl_close($curl);
+        return $output;
+    }
 }

app/Services/OrderService.php

@@ -2099,7 +2099,7 @@ class OrderService extends Service
      * @noinspection DuplicatedCode
      */
     public static function lockOrder ( $input , $session , $ip ){
-        $order = OrderService::getOrderBy('sys_num', $input['sys_num'],['ser_id', 'order_num', 'order_status','store_type','create_time','new_customer_id','category','p_id']);
+        $order = OrderService::getOrderBy('sys_num', $input['sys_num'],['ser_id', 'order_num', 'order_status','store_type','create_time','new_customer_id','category','p_id','company_id']);
         foreach($order as $k => $v){
             $input[$k] = $v;
         }
@@ -2415,7 +2415,7 @@ class OrderService extends Service
         }else{
             $allprice = $input['allprice'];//申请金额
         }
-        $poss['company_id'] = $session['company_id'];
+        $poss['company_id'] = $input['company_id']??$session['company_id'];
         $refund = RefundService::createRefund($poss);
         if(!$refund){
             return  ['Data' => '','ErrorMessage'=>'操作失败rf','ErrorCode'=>ErrorInc::MYSQL_FAILED];
@@ -2980,10 +2980,10 @@ class OrderService extends Service
             $BaseController = new BaseController();
             $res = $BaseController->http_get($urls);
             $data = json_decode($res, true);
-            $result = $data['jingdong_omnic_order_getorderlist_responce']['result'];
+            $result = $data['jingdong_omnic_order_query_orderList_responce']['result'];
             $result = json_decode($result, true);
             CommonService::addLog('获取取消订单', $urls.'---'.$res, $pt_id, 'orderService-getOrderCancelByJd');
-            if ($result['success'] == true) {
+            if (isset($result['success'])&&$result['success'] == true) {
                 $order_data = $result['data'];
                 if (!empty($order_data)) {
                     $order_data = $order_data['data'];