From 78535daf0f8749977d0618e92831d8ba5cd4ffa0 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 9 Nov 2018 17:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=A1=A8:=20=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E8=AE=A2=E5=8D=95=E7=9A=84=E6=80=BB=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=A1=AB=E6=B8=A0=E9=81=93=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/order_finance.php | 3 +++ .../trippestOrderSync/models/orderFinance_model.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php index 8e9e6b4d..5e355ee4 100644 --- a/webht/third_party/trippestOrderSync/controllers/order_finance.php +++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php @@ -92,6 +92,9 @@ class Order_finance extends CI_Controller { $report_order['RO_PayDescribe'] = $order_payment->payTypeDesc; $report_order['paydate'] = $order_payment->patDate; $report_order['OrderPrice'] = $report_order['money']; + if (strval($order_info->operater) === '435') { + $report_order['money'] = $order_info->OrderPrice; + } /** 订单人数 */ $person_num = $this->OrderFinance_model->get_order_person_num($coli_sn); $report_order['adultnumber'] = $person_num->adult_num; diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php index 91a46b4e..1c5d380c 100644 --- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php +++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php @@ -17,7 +17,7 @@ class OrderFinance_model extends CI_Model { coli.COLI_ApplyDate as reservedate ,coli.COLI_Cost as basemoney ,ISNULL(coli.COLI_OtherCost,0) as otherCost - ,dbo.ConvertToRMB('USD',ISNULL(coli.COLI_Price,0)) OrderPrice + ,dbo.ConvertToRMB(ISNULL(coli.COLI_Currency,'USD'),ISNULL(coli.COLI_Price,0)) OrderPrice ,gri.GRI_SN ,gri.GRI_No as TuanName ,opi.OPI_Name as ChinaName,opi.OPI_SN as operater,opi.OPI_DEI_SN ,gut.GUT_NationalityID,COI2_Country as country