财务表: 渠道订单的总收入填渠道价

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;

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