From 9de1b5ae24babca5a69ff21c623d78a1aa079f05 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 1 Apr 2019 09:46:31 +0800 Subject: [PATCH] =?UTF-8?q?Trippest=E5=90=8C=E6=AD=A5:=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BD=BF=E7=94=A8=E5=9C=B0=E6=8E=A5=E7=A4=BE?= =?UTF-8?q?=E6=94=B6=E6=AC=BE;=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/TulanduoApi.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 4f3e4f9e..4dd918a5 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -3,6 +3,8 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); +define('PAY_TO_AGENCY',15020); + class TulanduoApi extends CI_Controller { public $special_route = array( @@ -439,6 +441,7 @@ class TulanduoApi extends CI_Controller $coli_update_column["COLI_Price"] = $travel_fee; $coli_update_column["COLI_CUrrency"] = $travel_fee_currency; $coli_update_column["COLI_GroupCode"] = substr(trim_str($detail_jsonResp->orderDetail->agcOrderNo), 0, 49); + $coli_update_column["COLI_sourcetype"] = empty($this->city_info[$detail_jsonResp->orderDetail->operationDep]) ? 32090 : $this->city_info[$detail_jsonResp->orderDetail->operationDep]['COLI_sourcetype']; } $this->Order_update->biz_confirmlineinfo_update($coli_update_column); /** @@ -491,7 +494,7 @@ class TulanduoApi extends CI_Controller $latest_order_detail = $this->Orders_model->get_orderinfo_detail($coli_id); /** BIZ_GroupAccountInfo */ // 团款, 只有其他社的订单, 目的地项目组的团款已经直接收入海纳账户 - $paytype = 15020; // 地接代收 + $paytype = PAY_TO_AGENCY; // 地接代收 $pay_currency = 'RMB'; $auto_text = "dataAutoEnter "; // 删除旧的录入 @@ -975,7 +978,7 @@ class TulanduoApi extends CI_Controller $this->Orders_model->BIZ_COLI_OrderDetailText = "来自图兰朵系统同步" . $list_ele["orderId"] . ";线路:" . $list_ele['routeName'] . "; 团名: " . $list_ele['agcOrderNo']; $this->Orders_model->BIZ_COLI_GUT_SN = $this->Orders_model->BIZ_GUT_SN ? $this->Orders_model->BIZ_GUT_SN : null; $this->Orders_model->BIZ_COLI_OPI_ID = 435; - $this->Orders_model->BIZ_COLI_PayManner = 15006; + $this->Orders_model->BIZ_COLI_PayManner = PAY_TO_AGENCY; return $this->Orders_model->biz_confirm_save(); }