Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trippest 修复客人与订单未关联问题

Browse Source
feature/pay
lyt 7 years ago
parent 540f35c5a9
commit c3d1d34e3c
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File

15
webht/third_party/trippestOrderSync/controllers/TulanduoApi.php vendored
Unescape Escape View File

@ -109,18 +109,19 @@ class TulanduoApi extends CI_Controller
$all_list = array_merge($all_list, $f_resp_arr["responseData"]["orders"]);
}
$cnt = 0;
$pag_no_tmp = $this->pag_no_tmp();
foreach ($all_list as $k => $vo) {
$vo['agcOrderNo'] = mb_ereg_replace('(\s|　)', '', $vo['agcOrderNo']); // 去掉中文的全角空格
$PAG_Code = $pag_sub = null;
preg_match('^[a-zA-Z]+\-[0-9\-]+^', $this->characet($vo['routeName'], "UTF-8"), $temp_array);
if (empty($temp_array) && isset($this->pag_no_tmp()[$vo['routeName']])) {
if (empty($temp_array) && isset($pag_no_tmp[$vo['routeName']])) {
// 旧的数据没有线路代号
$PAG_Code = $this->pag_no_tmp()[$vo['routeName']];
log_message('error','未识别的线路名称 ' . $vo['orderId'] . " " . $vo['routeName'] . var_export($temp_array, 1));
$PAG_Code = $pag_no_tmp[$vo['routeName']];
$split_code = explode("-", $PAG_Code);
$PAG_Code = $split_code[0] . "-" . $split_code[1];
isset($split_code[2]) ? $pag_sub=$split_code[2] : null;
} else {
log_message('error','未识别的线路名称 ' . $vo['orderId'] . " " . $vo['routeName'] . var_export($temp_array, 1));
$PAG_Code = $pag_sub = null;
$split_code = explode("-", $temp_array[0]);
$PAG_Code = $split_code[0] . "-" . $split_code[1];
@ -290,7 +291,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID);
/*BIZ_GroupCombineOperationDetail*/
// 门票
if (isset($detail_jsonResp->orderDetail->operationDetails->sceneryOperations) &&
empty($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "sceneryOperations")) ) {
($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "sceneryOperations")) === array() ) {
foreach ($detail_jsonResp->orderDetail->operationDetails->sceneryOperations as $ks => $vso) {
$this->Orders_model->GCOD_GCI_combineNo = isset($detail_jsonResp->orderDetail->groupOrderNo) ? $detail_jsonResp->orderDetail->groupOrderNo : "";
$this->Orders_model->GCOD_operationType = "sceneryOperations";
@ -312,7 +313,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID);
// 用房 ...
// 用餐
if (isset($detail_jsonResp->orderDetail->operationDetails->restraurantOperations) &&
empty($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "restraurantOperations"))) {
($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "restraurantOperations")) === array() ) {
foreach ($detail_jsonResp->orderDetail->operationDetails->restraurantOperations as $vro) {
$this->Orders_model->GCOD_GCI_combineNo = isset($detail_jsonResp->orderDetail->groupOrderNo) ? $detail_jsonResp->orderDetail->groupOrderNo : "";
$this->Orders_model->GCOD_operationType = "restraurantOperations";
@ -333,7 +334,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID);
}
// 用车
if (isset($detail_jsonResp->orderDetail->operationDetails->touristCarOperations) &&
empty($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "touristCarOperations"))) {
($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "touristCarOperations")) === array() ) {
foreach ($detail_jsonResp->orderDetail->operationDetails->touristCarOperations as $vco) {
$this->Orders_model->GCOD_GCI_combineNo = isset($detail_jsonResp->orderDetail->groupOrderNo) ? $detail_jsonResp->orderDetail->groupOrderNo : "";
$this->Orders_model->GCOD_operationType = "touristCarOperations";
@ -354,7 +355,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID);
}
// 导游服务
if (isset($detail_jsonResp->orderDetail->operationDetails->guiderOperations) &&
empty($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "guiderOperations"))) {
($this->Orders_model->combineoperation_exist($detail_jsonResp->orderDetail->groupOrderNo, "guiderOperations")) === array() ) {
foreach ($detail_jsonResp->orderDetail->operationDetails->guiderOperations as $vgo) {
$this->Orders_model->GCOD_GCI_combineNo = isset($detail_jsonResp->orderDetail->groupOrderNo) ? $detail_jsonResp->orderDetail->groupOrderNo : "";
$this->Orders_model->GCOD_operationType = "guiderOperations";

2
webht/third_party/trippestOrderSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php vendored
Unescape Escape View File

@ -84,7 +84,7 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
{
if(!empty($this->orderData)){
$this->bizContentarr['orderData'] = $this->orderData;
$this->bizContent = json_encode($this->bizContentarr,JSON_UNESCAPED_UNICODE);
$this->bizContent = json_encode($this->bizContentarr);
}
return $this->bizContent;
}

2
webht/third_party/trippestOrderSync/models/TuLanDuo_queryContentBuilder.php vendored
Unescape Escape View File

@ -34,7 +34,7 @@ class TuLanDuo_queryContentBuilder extends CI_Model
public function getBizContent()
{
if(!empty($this->bizContentarr)){
$this->bizContent = json_encode($this->bizContentarr,JSON_UNESCAPED_UNICODE);
$this->bizContent = json_encode($this->bizContentarr);
}
return $this->bizContent;
}

2
webht/third_party/trippestOrderSync/models/orders_model.php vendored
Unescape Escape View File

@ -1025,7 +1025,7 @@ class Orders_model extends CI_Model {
. " ?, \n"
. " ? \n"
. ")";
// $query = $this->HT->query($sql, array($COLD_SN, $BPE_SN));
$query = $this->HT->query($sql, array($COLD_SN, $BPE_SN));
}
/*

Write Preview
Loading…
Cancel
Save