trippest trippest账户

feature/pay
lyt 8 years ago
parent 3c343a0ac4
commit be3aa99296

@ -97,7 +97,7 @@ class TulanduoApi extends CI_Controller
$all_list = $resp_arr["responseData"]["orders"];
$order_to_HT = array_map(
function($ele){
if ( ! in_array($ele['agcName'], array("D目的地桂林组")) ) {
if ( ! in_array($ele['agcName'], array("D目的地桂林组", "Trippest")) ) {
return $ele;
}
},$resp_arr["responseData"]["orders"]);
@ -111,7 +111,7 @@ class TulanduoApi extends CI_Controller
}
$f_order_to_HT = array_map(
function($ele){
if ( ! in_array($ele['agcName'], array("D目的地桂林组")) ) {
if ( ! in_array($ele['agcName'], array("D目的地桂林组", "Trippest")) ) {
return $ele;
}
},$f_resp_arr["responseData"]["orders"]);
@ -152,7 +152,7 @@ class TulanduoApi extends CI_Controller
$this->Orders_model->BIZ_COLI_SN = $this->Orders_model->GRI_SN = $this->Orders_model->GCI_SN = null;
$tmpv = $this->city_info[$vo['operationDep']]['PlanVEI_SN'] ? $this->city_info[$vo['operationDep']]['PlanVEI_SN'] : 1343;
$this->Orders_model->get_SN_by_vendorOrderId($vo['orderId'], $tmpv); // 查询订单是否已经录入过
if ($this->Orders_model->BIZ_COLI_SN === null && in_array($vo['agcName'], array("D目的地桂林组"))) {
if ($this->Orders_model->BIZ_COLI_SN === null && in_array($vo['agcName'], array("D目的地桂林组", "Trippest"))) {
$real_groupCode = $this->analysis_groupCode($vo['agcOrderNo']);
// set BIZ_COLI_SN, GRI_SN at Orders_model
$this->Orders_model->get_SN_by_groupCode($real_groupCode, $real_groupCode);
@ -270,7 +270,7 @@ class TulanduoApi extends CI_Controller
continue;
}
// 目的地的团已经主动取消, 只有其他渠道的团需要更新状态
if ($order->GCI_FromAgc != "D目的地桂林组" && mb_strstr($detail_jsonResp->orderDetail->agcOrderNo, "取消") !== false) {
if ( ! in_array($order->GCI_FromAgc, array("D目的地桂林组", "Trippest")) && mb_strstr($detail_jsonResp->orderDetail->agcOrderNo, "取消") !== false) {
$this->order_cancel($order->COLI_ID);
continue;
}
@ -342,7 +342,7 @@ class TulanduoApi extends CI_Controller
$pay_currency = 'RMB';
// 删除旧的录入
$this->Orders_model->biz_groupaccountinfo_cut($order->COLI_SN, $paytype);
if (isset($detail_jsonResp->orderDetail->travelFees) && $order->GCI_FromAgc != "D目的地桂林组") {
if (isset($detail_jsonResp->orderDetail->travelFees) && ! in_array($order->GCI_FromAgc, array("D目的地桂林组", "Trippest")) ) {
foreach ($detail_jsonResp->orderDetail->travelFees as $ktf => $vtf) {
// if ($vtf->reviewStatus == 0) { // 未审核的
// continue;
@ -600,7 +600,7 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
}
// $vendorID = 29188;//29188 1343; // test
$vas_info = array();
if ($input['agcName'] == 'D目的地桂林组') {
if (in_array($input['agcName'], array("D目的地桂林组", "Trippest"))) {
$vas_info = $this->Orders_model->get_vendorarrangestate_byVendor($input['orderId'], $vendorID);
if (empty($vas_info) && ! empty($input['agcOrderNo'])) {
$real_groupCode = $this->analysis_groupCode($input['agcOrderNo']);
@ -619,7 +619,7 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
$VAS_ConfirmInfo = $input['orderRemark'] . "\r\n======确认人: " . $input['orderDuty'] . ", 确认时间: " . $input['orderTime'];
$VAS_ConfirmInfo .= "\r\n" . $vas_info[0]->VAS_ConfirmInfo;
$update_vas = $this->Order_update->vendorStatus_update($vas_info[0]->VAS_SN, $vendor_manager->LMI_SN, $VAS_ConfirmInfo);
if ($input['agcName'] == 'D目的地桂林组') { // 传统团的不需要更新订单主表
if (in_array($input['agcName'], array("D目的地桂林组", "Trippest"))) { // 传统团的不需要更新订单主表
/** BIZ_confirmlineinfo */
$this->Order_update->coli_where_update = " COLI_SN=" . $vas_info[0]->COLI_SN;
$coli_update_column = array(
@ -762,4 +762,5 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
return $ret===$key;
}
}

@ -1695,5 +1695,4 @@ class Orders_model extends CI_Model {
}
}

Loading…
Cancel
Save