From 04a189e168855e017d8ad6e624cd9123726b1eb3 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 27 Jun 2019 11:13:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=BA=E7=A8=8B=E6=8E=A5=E5=8F=A3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/controllers/addorders.php | 2 ++ .../third_party/trainsystem/controllers/callback.php | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index 0ba6315e..0353c5dd 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -704,12 +704,14 @@ class addorders extends CI_Controller{ $PostData = array(); $TimeStamp = time(); $time = date('Y-m-d H:i:s',$TimeStamp); + $PostData['Authentication'] = new stdClass(); $PostData['Authentication']->TimeStamp = $time; $PostData['Authentication']->ServiceName = 'order.PartnerPayOrder'; $PostData['Authentication']->PartnerName = ORDERUSER; $MessageIdentity = md5($time.'order.PartnerPayOrder'.ORDERKEY); $PostData['Authentication']->MessageIdentity = $MessageIdentity; + $PostData['TrainOrderService'] = new stdClass(); $PostData['TrainOrderService']->PartnerName = ORDERUSER; $PostData['TrainOrderService']->OrderNumber = $CtripOrder; $PostData['TrainOrderService']->PayedPrice = $Price; diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php index b6d36723..89473b1f 100644 --- a/application/third_party/trainsystem/controllers/callback.php +++ b/application/third_party/trainsystem/controllers/callback.php @@ -153,9 +153,9 @@ class callback extends CI_Controller{ public function ctripcallback(){ $back_json = file_get_contents('php://input'); log_message('error','携程回调信息:'.$back_json); - /*$back_json = '{"Authentication":{"ServiceName":"web.order.returnTicketNotice","PartnerName":"tieyou","TimeStamp":"2019-1-18 11:35:22","MessageIdentity":"93F2BA3253829E8FAD29B5DEB7646A59"},"TrainOrderService":{"contactName":{},"contactMobile":{},"OrderNumber":"guilintravel1547778269","refundTicket":{"childBillId":{},"orderId":"8360041214","eOrderNumber":"EB59937931","eOrderType":"1","seatNumber":"01D\u53f7","passport":"544712454","passportName":"YANGFRANCISCHENG","realName":"YANGFRANCISCHENG","status":"1","reason":"\u9000\u7968\u6210\u529f\uff0c\u9000\u6b3e\u91d1\u989d:218.50\u5143"}}}';*/ + $back_json = '{"@attributes":{"xsi":"http:\/\/www.w3.org\/2001\/XMLSchema-instance"},"Authentication":{"TimeStamp":"2019-06-27 11:01:15","ServiceName":"web.order.notifyTicket","MessageIdentity":"08F97DF046FC32BB3F0CCBAF2DAAFB60","PartnerName":"tieyou"},"TrainOrderService":{"OrderInfo":{"OrderNumber":"guilintravel1561604425","ElectronicOrderNumber":"ED35331748","OrderType":"\u7535\u5b50","OrderTotleFee":"490.50","TicketInfo":{"OrderTicketFromStation":"\u54c8\u5c14\u6ee8\u897f","OrderTicketToStation":"\u5317\u4eac","OrderTicketYMD":"20190726","OrderTicketTime":"10:43","OrderTicketCheci":"D102","OrderTicketPrice":"490.50","OrderAcceptSeat":{"0":"\n "},"OrderTicketSeat":"\u4e00\u7b49\u5ea7","SeatNumber":"08\u8f66\u53a214F\u53f7","railwayTip":{"0":"\n "},"AuditTicketCount":"1","ChildTicketCount":"0","Passengers":{"Passenger":{"RealName":"SHCHERBAKOVOLEG","IdentityType":"\u62a4\u7167","NumberID":"655103175","TicketType":"\u6210\u4eba\u7968","Birth":{"0":"\n "},"InsuranceCount":"0"}}},"TicketInfoFinal":{"OrderTicketFromStation":"\u54c8\u5c14\u6ee8\u897f","OrderTicketToStation":"\u5317\u4eac","ChildBillid":{"0":"\n "},"ElectronicOrderNumber":"ED35331748","Result":"2","NoTicketReasons":{"0":"\n "},"OrderTicketYMD":"20190726","OrderTicketTime":"10:43","OrderTicketCheci":"D102","OrderTicketPrice":"490.50","SeatNumber":"08\u8f66\u53a214F\u53f7","railwayTip":{"0":"\n "},"TicketCheck":"\u68c0\u7968\u53e3B3\u53f7\u53e3","IsUserAcount":"0","ReturnFlag":"0","RescheduleFlag":"0","Tickets":{"Ticket":{"OrderTicketSeat":"\u4e00\u7b49\u5ea7","TicketType":"\u6210\u4eba\u7968","OrderTicketPrice":"490.50","TicketCount":"1","DetailInfos":{"DetailInfo":{"PassengerName":"SHCHERBAKOVOLEG","IdentityType":"\u62a4\u7167","NumberID":"655103175","SeatNo":"08\u8f66\u53a214F\u53f7"}}}}}}}}'; $ctrip_backdata = json_decode($back_json); - //print_r($ctrip_backdata); + //print_r($ctrip_backdata);die(); if(!empty($ctrip_backdata)){ $update_data = new stdClass(); $update_data->ServiceName = $ctrip_backdata->Authentication->ServiceName; @@ -170,7 +170,7 @@ class callback extends CI_Controller{ $update_data->reschedulecallback = ''; if($update_data->ServiceName == 'web.order.notifyTicket'){ - $update_data->OrderStatus = '4'; + $update_data->status = '4'; $update_data->ErrorMsg = '出票成功'; $update_data->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; $update_data->OrderTotleFee = $ctrip_backdata->TrainOrderService->OrderInfo->OrderTotleFee; @@ -276,12 +276,12 @@ class callback extends CI_Controller{ $this->BIZ_train_model->update_cold_planvei_sn($cold_sn); }else if($update_data->ServiceName == 'web.order.notifyNoTicket'){ $update_data->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; - $update_data->OrderStatus = '1'; + $update_data->status = '1'; $update_data->ErrorMsg = $ctrip_backdata->TrainOrderService->OrderInfo->NoTicketReasons; $update_data->confirmcallback = $back_json; }else if($update_data->ServiceName == 'web.order.returnTicketNotice'){ $update_data->ordernumber = $ctrip_backdata->TrainOrderService->OrderNumber; - $update_data->OrderStatus = '7'; + $update_data->status = '7'; $update_data->ErrorMsg = $ctrip_backdata->TrainOrderService->refundTicket->reason; $update_data->returncallback = $back_json;