Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -419,7 +419,9 @@ class TulanduoApi extends CI_Controller
         $partner_fee_currency = 'RMB';
         $pag_info = $this->analysis_productcode($detail_jsonResp->orderDetail->routeName, $detail_jsonResp->orderDetail->orderId);
         $total_num = $detail_jsonResp->orderDetail->adultNum+$detail_jsonResp->orderDetail->childNum;
-        $all_pag = $this->trippest->get_complex_pag(strtoupper($pag_info->PAG_Code));
+        // $all_pag = $this->trippest->get_complex_pag(strtoupper($pag_info->PAG_Code));
+        /** 渠道价不再补充计算, 直接计算所预订的产品渠道价 */
+        $all_pag = array(strtoupper($pag_info->PAG_Code));
         foreach ($all_pag as $kp => $vp) {
             $partner_price = $this->Orders_model->get_partner_price(strtoupper($vp), $total_num, $detail_jsonResp->orderDetail->travelDate);
             if ( ! empty($partner_price)) {

webht/third_party/trippestOrderSync/controllers/order_finance.php

@@ -227,6 +227,7 @@ class Order_finance extends CI_Controller {
         }
         $ret->processed_cold_sn = array_unique($processed_cold_sn);
         if ($debug !== false) {
+            $ret->report_order = $report_order;
             return $this->output->set_content_type('application/json')->set_output(json_encode($ret));
         }
         /** 开始写入数据库 */