From e5b4fa84f9f8472021232bf8b3b670118a99cb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 25 May 2023 15:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=AC=BE=E5=8F=8A?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E8=AE=B0=E5=BD=95=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/trainsystem/config/config.php |  5 ++--
 .../trainsystem/controllers/callback.php      | 25 ++++++++++++-------
 .../trainsystem/controllers/pages.php         | 25 ++++++++++---------
 .../trainsystem/models/train_system_model.php | 10 +++++---
 .../third_party/trainsystem/views/order.php   |  6 +++++
 5 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/application/third_party/trainsystem/config/config.php b/application/third_party/trainsystem/config/config.php
index 5793aa07..0b596a4c 100644
--- a/application/third_party/trainsystem/config/config.php
+++ b/application/third_party/trainsystem/config/config.php
@@ -74,8 +74,9 @@ $config["train_order_status_msg"]=array(
                                 "8"=>"乘客退票失败",
                                 "e"=>"数据错误，提交失败",
 								"9"=>"改签成功",
-                                "c"=>"订单取消",
-                                "r"=>"订单退款"
+                                "10"=>"退款(差价)",
+                                "12"=>"订单取消",
+                                "11"=>"订单退款"
                                     );
 
 //座次配对
diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php
index 45271adc..702c6fcf 100644
--- a/application/third_party/trainsystem/controllers/callback.php
+++ b/application/third_party/trainsystem/controllers/callback.php
@@ -240,7 +240,7 @@ class callback extends CI_Controller{
 					$update_data->operateTradeNo = $ctrip_backdata->ticketResult->operateTradeNo;  //操作流水号   如产生差额退款或者无票退款，退款通知里会有相同的操作流水号做对应。
 				}	
 				
-				$update_data->bookcallback = $back_json;
+				$update_data->ticketresultcallback = $back_json;
 				//$update_data->OrderTicketTime = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfo->OrderTicketTime;
 
 				//新接口数据,不一定保存到数据库里面，原订单已有，做个记录
@@ -338,28 +338,35 @@ class callback extends CI_Controller{
 				$this->BIZ_train_model->update_cold_planvei_sn($cold_sn,'28209');
 			}else if($update_data->ServiceName == 'notice.ordercancel'){ //订单取消
 				$update_data->ordernumber = $ctrip_backdata->cancelResult->companyOrderId;
-				$update_data->OrderStatus = 'c';
+				$update_data->OrderStatus = '12';
 				$update_data->ErrorMsg = '订单取消'.$ctrip_backdata->cancelResult->cancelTime;
 				$update_data->confirmcallback = $back_json;
 			}else if($update_data->ServiceName == 'notice.refundresult'){ //退款通知
+				$refundType =  $ctrip_backdata->refundResult->refundType; //退款类型int
+				$reason =  $ctrip_backdata->refundResult->reason; //退款原因
+				$refundTime = $ctrip_backdata->refundResult->refundTime; //退款时间
+				$return_money = $ctrip_backdata->refundResult->refundAmount; //退款金额
+
 				$update_data->ordernumber = $ctrip_backdata->refundResult->companyOrderId;
-				$update_data->OrderStatus = 'r';
-				$update_data->ErrorMsg = '退款:'.$ctrip_backdata->refundResult->refundTime;
-				$update_data->confirmcallback = $back_json;
+				if ($refundType=="1"){
+					$update_data->OrderStatus = '10';
+				}else{
+					$update_data->OrderStatus = '11';
+				}
+				$update_data->ErrorMsg = '退款:'.$this->train_refundType[$refundType]." 金额:".$return_money."  time:". $refundTime;
+				$update_data->refundcallback = $back_json;
 
 				//翰特添加退款记录
 				$refund_train_payment = new stdClass();
 				$return_order = $ctrip_backdata->refundResult->companyOrderId;
-				$return_money = $ctrip_backdata->refundResult->refundAmount; //退款金额
+			
 				$refund_train_payment->TOC_VEI_SN = "28209";
 					
 				//根据订单号获取cold_sn
 				$order_info = $this->train_system_model->get_order_info($return_order);
 				$cold_sn = $order_info->ts_cold_sn;
 				//print_r($order_info);
-				$refundType =  $ctrip_backdata->refundResult->refundType; //退款类型int
-				$reason =  $ctrip_backdata->refundResult->reason; //退款原因
-				$refundTime = $ctrip_backdata->refundResult->refundTime; //退款时间
+				
 
 				$memo = $return_order.'_'.$this->train_refundType[$refundType].'_原因:'. $reason . '_' . $refundTime; //退款集合信息
 				$refund_train_payment->TOC_Memo = $memo;
diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php
index b9a91a6b..ae485027 100644
--- a/application/third_party/trainsystem/controllers/pages.php
+++ b/application/third_party/trainsystem/controllers/pages.php
@@ -103,7 +103,8 @@ class pages extends CI_Controller{
         $list["page_link"]=$this->pagination->create_links();
 
         foreach ($list["data"] as $key => $value) {
-            $value->info = $this->order_status_msg[$value->ts_status];//自定义说明信息;
+			$vstatus = $value->ts_status=="r"?11:$value->ts_status;
+            $value->info = $this->order_status_msg[$vstatus];//自定义说明信息;
         }  
                    
         
@@ -144,17 +145,17 @@ class pages extends CI_Controller{
 		$data['msg'] = $train_infos->ts_errormsg;
 		$data['passengers'] = $passpager_detail;
 		
-		//聚合订单可以查询实时数据
-		if($train_infos->ts_channel == 'juhe'){
-			$post_data=array(
-                        "key"=>"79f03107b921ef31310bd40a1415c1cb",
-                        "orderid"=>$train_infos->ts_ordernumber
-                            ); 		
-			$back_data = GetPost_http("http://op.juhe.cn/trainTickets/orderStatus",$post_data);
-			$data['train_date'] = '';
-			$data['start_time'] = json_decode($back_data)->result->start_time;
-			$data['arrive_time'] = json_decode($back_data)->result->arrive_time;
-		}
+		// //聚合订单可以查询实时数据
+		// if($train_infos->ts_channel == 'juhe'){
+		// 	$post_data=array(
+        //                 "key"=>"79f03107b921ef31310bd40a1415c1cb",
+        //                 "orderid"=>$train_infos->ts_ordernumber
+        //                     ); 		
+		// 	$back_data = GetPost_http("http://op.juhe.cn/trainTickets/orderStatus",$post_data);
+		// 	$data['train_date'] = '';
+		// 	$data['start_time'] = json_decode($back_data)->result->start_time;
+		// 	$data['arrive_time'] = json_decode($back_data)->result->arrive_time;
+		// }
 		
 	    $this->load->view('bootstrap3/header');
 	    $this->load->view('order',$data);
diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php
index 535ae299..1553074d 100644
--- a/application/third_party/trainsystem/models/train_system_model.php
+++ b/application/third_party/trainsystem/models/train_system_model.php
@@ -190,13 +190,15 @@ class train_system_model extends CI_Model {
 						ts_checkdoor = '{$data->TicketCheck}',
 						ts_elecnumber = '{$data->ElectronicOrderNumber}',	
 					    ts_orderamount = '{$data->OrderTotleFee}',
-						ts_operateTradeNo = '{$data->operateTradeNo}',";
-					    //ts_bookcallback = '{$data->bookcallback}',
+						ts_operateTradeNo = '{$data->operateTradeNo}',
+					    ts_bookcallback = '{$data->bookcallback}',";
 						//ts_startime = '{$data->OrderTicketTime}',
-		}else if(!empty($data->bookcallback)){
-			$where .= "ts_bookcallback = '{$data->ts_bookcallback}',";
+		}else if(!empty($data->ticketresultcallback)){
+			$where .= "ts_ticketresultcallback = '{$data->ticketresultcallback}',";
 		}else if(!empty($data->confirmcallback)){
 			$where .= "ts_confirmcallback = '{$data->confirmcallback}',";
+		}else if(!empty($data->refundcallback )){
+			$where .= "ts_refundcallback = '{$data->refundcallback }',";
 		}else if(!empty($data->returncallback)){
 			$where .= "ts_returncallback = '{$data->returncallback}',";
 			if (!empty($data->operateTradeNo)){
diff --git a/application/third_party/trainsystem/views/order.php b/application/third_party/trainsystem/views/order.php
index 10df6de3..417fbff9 100644
--- a/application/third_party/trainsystem/views/order.php
+++ b/application/third_party/trainsystem/views/order.php
@@ -28,6 +28,12 @@
 	    	<p style="border-top:1px dashed #000; height:1px;margin-top:10px;" ></p>
 	    	<p><?php echo $msg;?></p>
 	    	<p style="text-align:center;"><a href="refund?order=<?php echo $ordernumber?>" style="padding:5px 15px;" class="btn btn-warning btn-sm">查看详情 <span class="glyphicon glyphicon-forward"></span></a></p>
+	    	<?php endif;?>
+			
+			<?php if((int)$status === 10 || (int)$status === 11):?>
+			<p style="border-top:1px dashed #000; height:1px;margin-top:10px;" ></p>
+	    	<p><?php echo $msg;?></p>
+	    	<p style="text-align:center;"><a href="refund?order=<?php echo $ordernumber?>" style="padding:5px 15px;" class="btn btn-warning btn-sm">查看详情 <span class="glyphicon glyphicon-forward"></span></a></p>
 	    	<?php endif;?>
 	    <?php else:?>
 	    	<p><?php echo $msg;?></p>