From 21aca8d35b0004c1289078d1e2ae12b16ae6f11d Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 31 Oct 2018 11:06:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5:=20=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/TulanduoApi.php | 18 +++++++++++++++++- .../trippestOrderSync/models/orders_model.php | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 9b4bd23a..dba2088a 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -381,6 +381,7 @@ class TulanduoApi extends CI_Controller $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) ) { @@ -389,6 +390,22 @@ class TulanduoApi extends CI_Controller } unset($vtf); } + // 渠道价 + $pag_info = $this->analysis_productcode($detail_jsonResp->orderDetail->routeName, $detail_jsonResp->orderDetail->orderId); + $total_num = $detail_jsonResp->orderDetail->adultNum+$detail_jsonResp->orderDetail->childNum; + $partner_price = $this->Orders_model->get_partner_price($pag_info->PAG_Code, $total_num, $detail_jsonResp->orderDetail->travelDate); + if ( ! empty($partner_price)) { + $travel_fee_currency = $partner_price->PKP_Currency ? $partner_price->PKP_Currency : "RMB"; + if (strval($partner_price->PKP_PriceType) === "1") { + // 每团 + $travel_fee = $partner_price->PKP_AdultCost; + } else { + // 每人 + $adult_price = bcmul($detail_jsonResp->orderDetail->adultNum, $partner_price->PKP_AdultCost); + $child_price = bcmul($detail_jsonResp->orderDetail->childNum, $partner_price->PKP_ChildCost); + $travel_fee = bcadd($adult_price, $child_price); + } + } $coli_update_column = array( "COLI_Memo" => substr($new_memo, 0, 400) ,"COLI_OrderDetailText" => $new_detail @@ -406,7 +423,6 @@ class TulanduoApi extends CI_Controller * insert BIZ_BookPeople,BIZ_PackageOrderInfo */ /** BIZ_ConfirmLineDetail */ - $pag_info = $this->analysis_productcode($detail_jsonResp->orderDetail->routeName, $detail_jsonResp->orderDetail->orderId); $COLD_MemoText = raw_json_encode(array("Pick up"=>$detail_jsonResp->orderDetail->toTraffic, "Drop off"=>$detail_jsonResp->orderDetail->backTraffic)); $new_memotext = trim($cold_memotext)===""||(json_decode($cold_memotext)!==null&&!is_numeric(json_decode($cold_memotext))) ? $COLD_MemoText : $cold_memotext; $cold_update_column = array( diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 38a9de19..3c158fd1 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -1754,6 +1754,24 @@ class Orders_model extends CI_Model { ); } + /** 获取产品的渠道价格 */ + public function get_partner_price($code="", $person_num=0, $price_date="") + { + $sql = "SELECT TOP 1 PKP_Currency, + PKP_PriceGrade,PKP_ValidDate,PKP_InvalidDate, + PKP_AdultCost,PKP_ChildCost,PKP_BabyCost, + PKP_PriceType --0每人 1每团 + ,p.* + from BIZ_PackageInfo pag + left join BIZ_PackagePrice p on p.PKP_PAG_SN=PAG_SN + where PAG_Code=? and PAG_DEI_SN=30 + and ? between PKP_PersonStart and PKP_PersonStop + and ? between PKP_ValidDate and PKP_InvalidDate + and PKP_VEI_SN in (1343,29188,30548) + order by p.Checked desc, PKP_PriceGrade asc,PKP_ValidDate desc"; // 重复日期的取新的 + return $this->HT->query($sql, array($code, $person_num, $price_date))->row(); + } + //来源终端 tablet mobile desktop public function check_device() { if (isset($_SERVER['HTTP_USER_AGENT'])) {