diff --git a/application/controllers/information.php b/application/controllers/information.php index 3bc803ec..12748951 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -440,7 +440,9 @@ class Information extends CI_Controller $update_info_log = $this->update_cache($ic_url, true); } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) { $update_info_log = $this->update_cache($ic_url); - } else if (strcasecmp($site_code, "cht") != 0 && strcasecmp($site_code, "gm") != 0) { //非cht站点并且非GM + } else if (strcasecmp($site_code, "ah") == 0 && !empty($auto_update_cache)) { + $update_info_log = $this->update_cache($ic_url); + } else if (strcasecmp($site_code, "cht") != 0 && strcasecmp($site_code, "gm") != 0 && strcasecmp($site_code, "ah") != 0) { //非cht站点并且非GM并且非AH $update_info_log = $this->update_cache($ic_url); } diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 4943ea3f..0b1eac7f 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -317,8 +317,19 @@ class ctrip_train extends CI_Controller{ $ResponseJson = post_ctrip($url,'','GET'); - //$ResponseData = json_decode($ResponseJson); - print_r($ResponseJson); + $ResponseData = json_decode($ResponseJson); + + $priceAddSeats = ['软卧','硬卧']; + foreach ($ResponseData->TransferLines as $methodsItems){ + foreach($methodsItems->Trains as $trainsItems){ + foreach ($trainsItems->Seats as $seatsItems){ + if(in_array($seatsItems->SeatName,$priceAddSeats)){ + $seatsItems->Price = ceil($seatsItems->Price * 1.2); + } + } + } + } + print_r(json_encode($ResponseData)); } } } \ No newline at end of file diff --git a/application/third_party/flightsystem/config/config.php b/application/third_party/flightsystem/config/config.php new file mode 100644 index 00000000..7c1c6d75 --- /dev/null +++ b/application/third_party/flightsystem/config/config.php @@ -0,0 +1,21 @@ +"", + "1"=>"ʧЧ", + "2"=>"֧", + "3"=>"֧Ʊ", + "4"=>"Ʊɹ", + "5"=>"Ʊʧ", + "6"=>"Ʊ", + "7"=>"г˿Ʊ(ǩ)ɹ", + "8"=>"˿Ʊʧ", + "e"=>"ݴύʧ" + ); \ No newline at end of file diff --git a/application/third_party/flightsystem/controllers/api.php b/application/third_party/flightsystem/controllers/api.php new file mode 100644 index 00000000..1a2bc665 --- /dev/null +++ b/application/third_party/flightsystem/controllers/api.php @@ -0,0 +1,72 @@ +load->helper('tuniu'); + } + + public function index(){ + + } + + public function searchForHt(){ + $departDate = $this->input->get_post('departDate'); + $departCode = $this->input->get_post('departCode'); + $arriveCode = $this->input->get_post('arriveCode'); + + if(empty($departDate) || empty($departCode) || empty($arriveCode)){ + exit('请传入正确的参数,如有疑问请联系CYC!!!'); + } + + $url = 'https://www.trainspread.com/guide.php/flight/search/?departDate='.$departDate.'&departCode='.$departCode.'&arriveCode='.$arriveCode; + $json = post_tuniu($url); + $data['data'] = json_decode($json); + + $this->load->view('searchForHt',$data); + } + + public function addorders(){ + //接收参数 + $departime = $this->input->get_post('departime'); + $fromcode = $this->input->get_post('fromcode'); + $tocode = $this->input->get_post('tocode'); + $flightnumber = $this->input->get_post('flightnumber'); + + //测试数据 + $deparTime = '2019-08-15'; + $fromCode = 'BJS'; + $toCode = 'SHA'; + $flightNumber = 'KN5955'; + + //查询到sessionid + $searchJson = get_serach_json($deparTime,$fromCode,$toCode,$flightNumber); + $returnJson = post_tuniu(TUNIU_FLIGHT_API,$searchJson,'POST'); + $returnData = json_decode($returnJson); + $sessionId = $returnData->data->queryResultList['0']->resourceList['0']->sessionId; + //$sessionId = 'eyJuYW1lIjoiZGlzdE5ldyIsImZrIjoiTkFZI1NIQSNLTjU5NTUjMjAxOS0wOC0xNSIsInNpIjo4LCJjYSI6IlkiLCJjbyI6IkgiLCJhcCI6IjUxOCIsImNwIjoiNzcyIn0'; + echo $sessionId; + + //获取航班信息,订单信息 + + + //拼接下单报文 + $data = '{"contactTel":"18877381547","flight":{"adtPrice":1111,"arriveCityCode":"SHA","cabinClass":"Y","cabinCode":"H","departureCityCode":"BJS","departureDate":"2019-08-15","flightNum":"KN5955"},"remark":"haina123456","sessionId":"'.$sessionId.'","touristList":[{"birthday":"1992-08-13","firstName":"chen","lastName":"yuchao","name":"陈宇超","personType":"ADT","psptId":"450302199208131039","psptType":1,"tel":"18877381547"}]}'; + $timestamp = time(); + $sign = md5(TUNIU_FLIGHT_KEY.$data.$timestamp); + $bookJson = '{ + "purchaseId": '.TUNIU_FLIGHT_ID.', + "sign": "'.$sign .'", + "timestamp": '.$timestamp.', + "function": "createOrder", + "data":'.$data.' + }'; + //echo $bookJson;die(); + $returnJson = post_tuniu(TUNIU_FLIGHT_API,$bookJson,'POST'); + //print_r($returnData); + echo $returnJson; + //生成报文 + } +} \ No newline at end of file diff --git a/application/third_party/flightsystem/controllers/pages.php b/application/third_party/flightsystem/controllers/pages.php new file mode 100644 index 00000000..3479c6c4 --- /dev/null +++ b/application/third_party/flightsystem/controllers/pages.php @@ -0,0 +1,20 @@ +load->helper('tuniu'); + } + + public function index(){ + exit('ǰܣ'); + } + + public function homepage(){ + $this->load->view('common/header'); + $this->load->view('homepage'); + $this->load->view('common/footer'); + } +} \ No newline at end of file diff --git a/application/third_party/flightsystem/helpers/tuniu_helper.php b/application/third_party/flightsystem/helpers/tuniu_helper.php new file mode 100644 index 00000000..264ecac7 --- /dev/null +++ b/application/third_party/flightsystem/helpers/tuniu_helper.php @@ -0,0 +1,90 @@ += 99){ + return '有'; + }else{ + return $num; + } + } + } + } + + //获取毫秒数 + function get_microtime (){ + list($s1, $s2) = explode(' ', microtime()); + return (float)sprintf('%.0f', (floatval($s1) + floatval($s2)) * 1000); + } + + //获取飞机查询报文 + function get_serach_json($departime,$fromcode,$tocode,$flightnumber=null){ + $timestamp = time(); + $function = 'queryNew'; + $flightnumberstr = ''; + if(!empty($flightnumber)){ + $flightnumberstr = ',"flightNum":"'.$flightnumber.'"'; + } + + $data = '{"channelId":7,"departureDate":"'.$departime.'","dstCityCode":"'.$tocode.'"'.$flightnumberstr.',"orgCityCode":"'.$fromcode.'"}'; + $sign = md5(TUNIU_FLIGHT_KEY.$data.$timestamp); + + $postJson = '{ + "purchaseId": '.TUNIU_FLIGHT_ID.', + "sign": "'.$sign .'", + "timestamp": '.$timestamp.', + "function": "'.$function.'", + "data":'.$data.' + }'; + + return $postJson; + } + + //发送请求函数 + function post_tuniu($url, $data = '', $method = 'GET') { + $curl = curl_init(); // 启动一个CURL会话 + curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址 + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 + curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器 + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转 + curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer + if ($method == 'POST' && !empty($data)) { + curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求 + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包 + curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); + } + curl_setopt($curl, CURLOPT_TIMEOUT, 40); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT_MS, 40000); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 + $tmpInfo = curl_exec($curl); // 执行操作 + $errno = curl_errno($curl); + if ($errno !== 0) { + return false; + echo $errno . curl_error($curl); //记录错误日志 + } + curl_close($curl); //关闭CURL会话 + return $tmpInfo; //返回数据 + } + +?> \ No newline at end of file diff --git a/application/third_party/flightsystem/views/common/footer.php b/application/third_party/flightsystem/views/common/footer.php new file mode 100644 index 00000000..b231b902 --- /dev/null +++ b/application/third_party/flightsystem/views/common/footer.php @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/third_party/flightsystem/views/common/header.php b/application/third_party/flightsystem/views/common/header.php new file mode 100644 index 00000000..57025d13 --- /dev/null +++ b/application/third_party/flightsystem/views/common/header.php @@ -0,0 +1,131 @@ + + + + + 出票系统 + + + + + + + \ No newline at end of file diff --git a/application/third_party/flightsystem/views/homepage.php b/application/third_party/flightsystem/views/homepage.php new file mode 100644 index 00000000..0163dcf1 --- /dev/null +++ b/application/third_party/flightsystem/views/homepage.php @@ -0,0 +1,122 @@ + +
+
+
+

翰特订单号 订单列表>>版本:V1.0

+
+
+
+ "> + +
+

外联:OPI_Name;}?>

+
+
+
+
+

飞机订单信息

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号航班号舱位出发城市抵达城市起飞日期起飞时间抵达时间票价是否提交过
1ZH1521经济舱(F)北京上海2019-10-3020:0023:30800
+ + + + + + + + + + + + + + + + + + + + + + + + +
序号姓名护照年龄类型
1陈宇超4564651635213246546成人
+ + +
+
+
+
+
diff --git a/application/third_party/flightsystem/views/searchForHt.php b/application/third_party/flightsystem/views/searchForHt.php new file mode 100644 index 00000000..e2a30da8 --- /dev/null +++ b/application/third_party/flightsystem/views/searchForHt.php @@ -0,0 +1,83 @@ + + +
+
+

单程:queryResultList['0']->flight->departCityName.'-----'.$data->queryResultList['0']->flight->arriveCityName ?>

+
+
In the Morning (06 ~ 12)
+
In the Afternoon (12 ~ 18)
+
In the Evening (18 ~ 24)
+
All time
+
+ queryResultList as $items){ + echo '
'; + echo '

'.$items->flight->airlineCompany.' ('.$items->flight->flightNo.')

'; + echo '
'.$items->flight->departAirportName.' ('.$items->flight->departAirportTerminal.') '.$items->flight->departTime.'
'; + echo '
'.$items->flight->duration.':00
'; + echo '
'.$items->flight->arriveAirportName.' ('.$items->flight->arriveAirportTerminal.') '.$items->flight->arriveTime.'
'; + echo '
'.$items->flight->craftType.' ('.$items->flight->meal.')
'; + echo '
经济舱 ('.$items->resourceList['0']->price->cabinClassFullPrice.') 全价:
'; + echo ''; + echo '
'; + echo '
'; + foreach ($items->resourceList as $seatItems){ + echo '
'; + echo '
'.$seatItems->cabinList['0']->cabinClassName.'('.$seatItems->cabinList['0']->cabinClass.')
'; + echo '
免费托运行李额:'.$seatItems->cabinList['0']->freeLuggage.$seatItems->cabinList['0']->freeLuggageUnit.'
'; + if($seatItems->price->adultFacePrice != $seatItems->price->cabinClassFullPrice){ + echo '
票面价(折扣):'.$seatItems->price->adultFacePrice.' ('.round(($seatItems->price->adultFacePrice / $seatItems->price->cabinClassFullPrice),2) *10 .')
'; + }else{ + echo '
票面价:'.$seatItems->price->adultFacePrice.'(全价)
'; + } + //echo '
全价:'.$seatItems->price->cabinClassFullPrice.'
'; + echo '
余票数:'.$seatItems->cabinList['0']->seatStatus.'
'; + echo '
'; + echo '
'; + } + echo '
'; + + } + + ?> +
+
+ diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php index 4d002ae7..a2de5501 100644 --- a/application/third_party/trainsystem/controllers/callback.php +++ b/application/third_party/trainsystem/controllers/callback.php @@ -111,6 +111,7 @@ class callback extends CI_Controller{ $add_train_order_data->TOC_TicketCost = $data->orderamount; $add_train_order_data->poundage = (count($data->passengers)*2)."";//手续费,每人两块,转换成字符串 $add_train_order_data->FOI_TrainNetOrderNo = $data->ordernumber; + $add_train_order_data->TOC_VEI_SN = 30427; $this->BIZ_train_model->add_train_payment($add_train_order_data); $update_data->confirmcallback = $data_post["data"]; @@ -150,7 +151,7 @@ class callback extends CI_Controller{ $add_train_order_data->TOC_DepartureDate = $data->train_date; $add_train_order_data->TOC_TicketCost = -$refund_money; $add_train_order_data->FOI_TrainNetOrderNo = null;//退票不用更新取票号,以此在模型里面判断是否为退票消息 - + $add_train_order_data->TOC_VEI_SN = 30427; $this->BIZ_train_model->add_train_payment($add_train_order_data); }else{ //有可能提交了退票或者还没有退票 @@ -261,6 +262,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $tickets_item->OrderTicketPrice; $data_passager->seatype = $tickets_item->OrderTicketSeat; $data_passager->seatdetail = $ticket_item2->SeatNo; + $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } }else{ @@ -271,6 +273,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $tickets_item->OrderTicketPrice; $data_passager->seatype = $tickets_item->OrderTicketSeat; $data_passager->seatdetail = $tickets_item->DetailInfos->DetailInfo->SeatNo; + $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } } @@ -286,6 +289,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketPrice; $data_passager->seatype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketSeat; $data_passager->seatdetail = $items->SeatNo; + $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } } @@ -300,6 +304,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketPrice; $data_passager->seatype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketSeat; $data_passager->seatdetail = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->SeatNo; + $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 962ddf69..54a0f5e9 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -194,10 +194,11 @@ class BIZ_train_model extends CI_Model { TOC_TrainNumber, TOC_DepartureDate, TOC_TicketCost, - TOC_WL + TOC_WL, + TOC_VEI_SN ) - VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}))"; - $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%","退票费 ".$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost)); + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),?)"; + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%","退票费 ".$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN)); }else{ //出票 //BIZ_FlightsOrderInfo.FOI_TrainNetOrderNo,更新取票号 @@ -238,10 +239,11 @@ class BIZ_train_model extends CI_Model { TOC_DepartureDate, TOC_TicketCost, TOC_WL, - TOC_OtherCost + TOC_OtherCost, + TOC_VEI_SN ) - VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1)"; - $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage)); + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null,?),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1,?)"; + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage,$data->TOC_VEI_SN)); } return $query; } diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 5af06dae..0341e261 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -339,6 +339,12 @@ $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); return true; } + //ah跳转测试页面 + function goto_ahtest_page() { + var site_url = 'https://www.asiahighlights.com/index.php/information/detail/?no_cache=true&static_html_url='; + $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); + return true; + } function goto_test_page_pgr() { var site_url = 'http://192.155.250.125:8011/guide.php/travelguide/guide/?static_html_url='; $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); @@ -619,7 +625,10 @@ if ($embody == 1) { ic_sitecode == 'gm') {?> - + + ic_sitecode == 'ah') {?> + + @@ -1443,7 +1452,7 @@ foreach ($author_list as $author_item) { 忽略URL重复
- config->item('site_code'), array('cht', 'gm'))) {?> + config->item('site_code'), array('cht', 'gm','ah'))) {?> diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index 5af49913..674c8270 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -32,27 +32,7 @@ class PaymentService extends CI_Controller { } else { $data['notelist'] = $this->note_model->search_date($data['date']); } - array_walk($data["notelist"], function(&$ele, $key) - { - $ele->brand_name = "none"; - switch ($ele->OPN_accountMethod) { - case '15016': - $ele->brand_name = "WeChat"; - break; - case '15010': - case '15002': - $ele->brand_name = "PayPal"; - break; - case '15018': - $ele->brand_name = "Credit Card"; - break; - case '15015': - $ele->brand_name = "Alipay"; - break; - default: - break; - } - }); + array_walk($data["notelist"], 'PaymentService::set_brandname'); /** * 导出记录用的记录节点 @@ -70,10 +50,33 @@ class PaymentService extends CI_Controller { $data = array(); $data['date'] = date('Y-m-d'); $data['notelist'] = $this->note_model->failnote(100); + array_walk($data["notelist"], 'PaymentService::set_brandname'); $this->load->view("payment_list",$data); return; } + public function set_brandname(&$ele) + { + $ele->brand_name = "none"; + switch ($ele->OPN_accountMethod) { + case '15016': + $ele->brand_name = "WeChat"; + break; + case '15010': + case '15002': + $ele->brand_name = "PayPal"; + break; + case '15018': + $ele->brand_name = "Credit Card"; + break; + case '15015': + $ele->brand_name = "Alipay"; + break; + default: + break; + } + } + public function send_notify($opn_id=NULL, $old_ssje=NULL) { ignore_user_abort(true); diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index a92a29d0..b80ba304 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -604,7 +604,7 @@ class IPayLinksService extends CI_Controller // APP 组的退款查不到原始收款记录 $pure_orderid = strstr($parent_order,"_",true); $pure_orderid = $pure_orderid===false ? $parent_order : $pure_orderid; - if (empty($parent_note) && true === $this->IPayLinks_model->if_APP_order($pure_orderid) ) { + if (true === $this->IPayLinks_model->if_APP_order($pure_orderid) ) { $parent_note = $parent_payment; // 补充字段 $parent_note->IPL_orderId = $parent_order . '_B'; @@ -903,12 +903,13 @@ class IPayLinksService extends CI_Controller bcscale(2); /** 退款成功 */ if (isset($asyns_resp->data->refundOrderId) && strcmp($asyns_resp->data->resultCode, '2') == 0) { + $notice_time = $asyns_resp->data->completeTime=='' ? time() : strtotime($asyns_resp->data->completeTime); $this->Note_model->save_refund( strval($asyns_resp->data->dealId) , strval($asyns_resp->data->orderId) , strval("-" . bcdiv(floatval($asyns_resp->data->refundAmount), 100)) , strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->refundTime))) - , strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->completeTime))) + , strval(date('Y-m-d H:i:s',$notice_time)) , $asyns_resp->data->resultCode , null , json_encode($asyns_resp->data) diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php index b568e59e..37174b71 100644 --- a/webht/third_party/pay/views/payment_list.php +++ b/webht/third_party/pay/views/payment_list.php @@ -260,6 +260,15 @@