diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 96580b07..7d777d49 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -68,6 +68,7 @@ class TulanduoApi extends CI_Controller // $this->userId = "18"; // $this->key = "d05c25e6e6c5d4898161e0aaf700d9c7"; mb_regex_encoding("UTF-8"); + bcscale(4); } /*! @@ -368,10 +369,27 @@ class TulanduoApi extends CI_Controller $new_memo = trim($detail_jsonResp->orderDetail->orderRemark)=="" ? $old_memo : $old_memo . " orderRemark\r\n" . $detail_jsonResp->orderDetail->orderRemark . "\r\n"; $old_detail = mb_strstr($coli_orderdetailtext, " operations", true)!==false ? mb_strstr($coli_orderdetailtext, " operations", true) : $coli_orderdetailtext; $new_detail = trim($allDetails_to_HT)=="" ? $old_detail : $old_detail . " operations\r\n" . $allDetails_to_HT . "\r\n"; + // 团款总金额 美元币种 + $travel_fee = 0; + $travel_fee_currency = 'RMB'; + if (isset($detail_jsonResp->orderDetail->travelFees) ) { + foreach ($detail_jsonResp->orderDetail->travelFees as $ktf => $vtf) { + $travel_fee = bcadd($travel_fee, $vtf->sumMoney); + } + unset($vtf); + } + $travel_fee = $getInfo_byGroupCode!==null ? + (intval($getInfo_byGroupCode->COLI_OPI_ID)===435 ? $travel_fee : $getInfo_byGroupCode->COLI_Price) + : $travel_fee; + $travel_fee_currency = $getInfo_byGroupCode!==null ? + (intval($getInfo_byGroupCode->COLI_OPI_ID)===435 ? $travel_fee_currency : $getInfo_byGroupCode->COLI_CUrrency) + : $travel_fee_currency; $coli_update_column = array( "COLI_Memo" => substr($new_memo, 0, 400) ,"COLI_OrderDetailText" => $new_detail ,"COLI_State" => $coli_state + ,"COLI_Price" => $travel_fee + ,"COLI_CUrrency" => $travel_fee_currency ); $this->Order_update->biz_confirmlineinfo_update($coli_update_column); /** BIZ_ConfirmLineDetail */ // nothing to update diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index e8292d47..8fa7dfcf 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -500,7 +500,7 @@ class Orders_model extends CI_Model { public function get_SN_by_groupCode($code, $NoName) { - $sql = "SELECT top 1 COLI_SN,gri.GRI_SN,cold.COLD_PlanVEI_SN,cold.COLD_SN,coli.COLI_ID,coli.COLI_Memo,coli.COLI_OrderDetailText,coli.COLI_State,coli.COLI_OPI_ID + $sql = "SELECT top 1 COLI_SN,gri.GRI_SN,cold.COLD_PlanVEI_SN,cold.COLD_SN,coli.COLI_ID,coli.COLI_Memo,coli.COLI_OrderDetailText,coli.COLI_State,coli.COLI_OPI_ID,coli.COLI_Price,coli.COLI_CUrrency FROM BIZ_ConfirmLineInfo coli inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=COLI_SN LEFT JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN @@ -1781,6 +1781,13 @@ class Orders_model extends CI_Model { } } + public function convert_RMB_to_currency($money=0, $toCurrency='USD') + { + return $this->HT + ->query("SELECT tourmanager.dbo.[ConvertCurrencyToCurrency](1,'RMB','$toCurrency',$money) as rmb ") + ->row()->rmb; + } + public function test() { // return NULL;