From 57874d7fb616b62f8678f2dcd7971522f8b1b6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 28 May 2019 17:22:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0package=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 0e487b25..7b88d0f6 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1292,7 +1292,7 @@ $meta_subnavi_arr = array( From 647d89ffca7216fafd16b52089cb2abbc0ad90bd Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 29 May 2019 15:54:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=A7=E4=BD=8D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=80=E7=AD=89=E5=8D=A7=E3=80=81=E4=BA=8C?= =?UTF-8?q?=E7=AD=89=E5=8D=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrip/controllers/ctrip_train.php | 56 +++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index bdd6c8f9..b681d955 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -65,15 +65,15 @@ class ctrip_train extends CI_Controller{ header("HTTP/1.1 404 Not Found"); exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); }else{ - $from = $FromName->station_name; - $to = $ToName->station_name; + $FromName = $FromName->station_name; + $ToName = $ToName->station_name; } //生成请求链接 $TimeStamp = time(); $Sign = md5($TimeStamp.DATAKEY); - $url = JSONRETURN.'SearchS2S/?From='.urlencode($from).'&To='.urlencode($to).'&DepartDate='.$date.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + $url = JSONRETURN.'SearchS2S/?From='.urlencode($FromName).'&To='.urlencode($ToName).'&DepartDate='.$date.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; $api_start_time = microtime(true); @@ -84,7 +84,6 @@ class ctrip_train extends CI_Controller{ $ResponseData = json_decode($ResponseJson); $api_responsive_time = $api_end_time - $api_start_time; - //print_r($ResponseData);die(); if(empty($ResponseData->Trains)){ log_message('error','ctrip_trian|status:trains is empty |相应时间:'.$api_responsive_time); @@ -103,6 +102,7 @@ class ctrip_train extends CI_Controller{ $obj = array(); $i = 0; $PriceStr = ''; + //数据解析 if(!empty($ResponseData->Trains)){ foreach ($ResponseData->Trains as $TrainInfo){ @@ -111,23 +111,29 @@ class ctrip_train extends CI_Controller{ $SeaType = ''; $gjrwNum = $rwNum = $rzNum = $tdzNum = $wzNum = $yzNum = $edzNum = $ydzNum = $swzNum = $ywNum = $dwNum = null; foreach($TrainInfo->Seats as $Seats){ - if($Seats->SeatName == '高级软卧下'){ + //从香港出发的 D/G 火车加价3% + if($from == 'XJA'){ + if(stripos($TrainInfo->TrainNo, "G") !== false || stripos($TrainInfo->TrainNo, "D") !== false){ + $Seats->Price = $Seats->Price * 1.03; + } + } + + if($Seats->SeatName == '高级软卧上'){ $gjrwXiaPrice = $Seats->Price * 10; $SeaType .= '"6":"'.$gjrwXiaPrice.'","A6":"¥'.$Seats->Price.'",'; $gjrwNum = $Seats->TicketLeft; } - if($Seats->SeatName == '软卧下'){ + if($Seats->SeatName == '软卧上'){ $rwPrice = $Seats->Price * 10; $SeaType .= '"4":"'.$rwPrice.'","A4":"¥'.$Seats->Price.'",'; $rwNum = $Seats->TicketLeft; } - /*if($Seats->SeatName == '一等双软下'){ - $ydrwPrice = $Seats->Price * 10; - $SeaType .= '"I":"'.$ydrwPrice.'","AI":"¥'.$Seats->Price.'",'; - $ydrwNum = $Seats->TicketLeft; - }*/ + if($Seats->SeatName == '一等双软上'){ + $SeaType .= '"YDW":"¥'.$Seats->Price.'",'; + $ydwNum = $Seats->TicketLeft; + } if($Seats->SeatName == '软座'){ $rzPrice = $Seats->Price * 10; @@ -167,19 +173,18 @@ class ctrip_train extends CI_Controller{ $swzNum = $Seats->TicketLeft; } - if($Seats->SeatName == '硬卧下'){ + if($Seats->SeatName == '硬卧上'){ $ywPrice = $Seats->Price * 10; $SeaType .= '"3":"'.$ywPrice.'","A3":"¥'.$Seats->Price.'",'; $ywNum = $Seats->TicketLeft; } - /*if($Seats->SeatName == '二等双软下'){ - $errwPrice = $Seats->Price * 10; - $SeaType .= '"J":"'.$errwPrice.'","AJ":"¥'.$Seats->Price.'",'; - $errwNum = $Seats->TicketLeft; - }*/ + if($Seats->SeatName == '二等双软上'){ + $SeaType .= '"EDW":"¥'.$Seats->Price.'",'; + $erwNum = $Seats->TicketLeft; + } - if($Seats->SeatName == '动卧下'){ + if($Seats->SeatName == '动卧上'){ $SeaType .= '"F":"¥'.$Seats->Price.'",'; $dwNum = $Seats->TicketLeft; } @@ -200,28 +205,21 @@ class ctrip_train extends CI_Controller{ $ydzNum = isset($ydzNum) ? ticket_exchange($ydzNum,$iseven) : ''; $swzNum = isset($swzNum) ? ticket_exchange($swzNum,$iseven) : ''; $dwNum = isset($dwNum) ? ticket_exchange($dwNum,$iseven) : ''; - /*$ydrwNum = isset($ydrwNum) ? ticket_exchange($ydrwNum,$iseven) : ''; - $errwNum = isset($errwNum) ? ticket_exchange($errwNum,$iseven) : ''; - - if($rwNum == '' && $ydrwNum != ''){ - $rwNum = $ydrwNum; - } + $ydwNum = isset($ydwNum) ? ticket_exchange($ydwNum,$iseven) : ''; + $erwNum = isset($erwNum) ? ticket_exchange($erwNum,$iseven) : ''; - if($ywNum == '' && $errwNum != ''){ - $ywNum = $errwNum; - }*/ $runMin = $TrainInfo->DurationMinutes % 60; $runHour = ($TrainInfo->DurationMinutes - $runMin) / 60; - $ReturnData->data->result[$i] = '|预定|'.$TrainInfo->Train12306No.'|'.$TrainInfo->TrainNo.'|'.$TrainInfo->FromStationName.'|'.$TrainInfo->ToStationName.'|'.$TrainInfo->FromTelcode.'|'.$TrainInfo->ToTelcode.'|'.$TrainInfo->StartTime.'|'.$TrainInfo->ArriveTime.'|'.$runHour.':'.$runMin.'|'.$TrainInfo->CanWebBuy.'||'.date('Ymd',strtotime($date)).'||||||||'.$gjrwNum.'||'.$rwNum.'|'.$rzNum.'|'.$tdzNum.'|'.$wzNum.'||'.$ywNum.'|'.$yzNum.'|'.$edzNum.'|'.$ydzNum.'|'.$swzNum.'|'.$dwNum.'||'; + $ReturnData->data->result[$i] = '|预定|'.$TrainInfo->Train12306No.'|'.$TrainInfo->TrainNo.'|'.$TrainInfo->FromStationName.'|'.$TrainInfo->ToStationName.'|'.$TrainInfo->FromTelcode.'|'.$TrainInfo->ToTelcode.'|'.$TrainInfo->StartTime.'|'.$TrainInfo->ArriveTime.'|'.$runHour.':'.$runMin.'|'.$TrainInfo->CanWebBuy.'||'.date('Ymd',strtotime($date)).'||||||||'.$gjrwNum.'||'.$rwNum.'|'.$rzNum.'|'.$tdzNum.'|'.$wzNum.'||'.$ywNum.'|'.$yzNum.'|'.$edzNum.'|'.$ydzNum.'|'.$swzNum.'|'.$dwNum.'|||'.$ydwNum.'|'.$erwNum; $data = '{"validateMessagesShowId":"_validatorMessage","status":true,"httpstatus":200,"data":{'.$PriceStr.'},"messages":[],"validateMessages":{}}'; $ReturnData->data->price[$i] = $data; $i++; } } - //print_r($ResponseData); + //print_r($ResponseData);die(); $ReturnData->data->map = (object)$obj; print_r(json_encode($ReturnData)); } From 298d38218400839765bf01b03bad4caccacaf23a Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 30 May 2019 13:59:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=BA=A7=E4=BD=8D=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/config/config.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/config/config.php b/application/third_party/trainsystem/config/config.php index 7e4ddb07..1d87da49 100644 --- a/application/third_party/trainsystem/config/config.php +++ b/application/third_party/trainsystem/config/config.php @@ -63,7 +63,9 @@ $config["train_zw"]=array( "2"=>"软座", "3"=>"硬卧", "1"=>"硬座", - "F"=>"动卧" + "F"=>"动卧", + "YDW"=>"一等卧", + "EDW"=>"二等卧" ); //数据库座次配对,包厢硬卧(5),无座(WZ),聚合没有 $config["db_train_zw"]=array( @@ -80,7 +82,9 @@ $config["db_train_zw"]=array( "F"=>"F", "3"=>"3", "2"=>"2", - "1"=>"1" + "1"=>"1", + "YDW"=>"YDW", + "EDW"=>"EDW" ); //票种配对 $config["train_piaotype"]=array( From b5440b701f2b1026fa857dac829dbb7fe162fade Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 30 May 2019 15:26:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BA=A7?= =?UTF-8?q?=E4=BD=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctrip/controllers/ctrip_train.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index b681d955..4943ea3f 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -109,7 +109,8 @@ class ctrip_train extends CI_Controller{ $obj[$TrainInfo->FromTelcode] = $TrainInfo->FromStationName; $obj[$TrainInfo->ToTelcode] = $TrainInfo->ToStationName; $SeaType = ''; - $gjrwNum = $rwNum = $rzNum = $tdzNum = $wzNum = $yzNum = $edzNum = $ydzNum = $swzNum = $ywNum = $dwNum = null; + //余数初始化为空 + $gjrwNum = $rwNum = $rzNum = $tdzNum = $wzNum = $yzNum = $edzNum = $ydzNum = $swzNum = $ywNum = $dwNum = $ydwNum = $edzNum = null; foreach($TrainInfo->Seats as $Seats){ //从香港出发的 D/G 火车加价3% if($from == 'XJA'){