diff --git a/application/third_party/htmlcompressor/controllers/index_ah.php b/application/third_party/htmlcompressor/controllers/index_ah.php
index 3633daca..f816bdbe 100644
--- a/application/third_party/htmlcompressor/controllers/index_ah.php
+++ b/application/third_party/htmlcompressor/controllers/index_ah.php
@@ -126,7 +126,7 @@ class Index_ah extends CI_Controller
}
//把网页内容和css提交到purifycss处理
- $purifycss_server = 'http://184.172.113.216:33033/';
+ $purifycss_server = 'http://169.54.167.189:33033/';
$optimize_css = GET_HTTP($purifycss_server, 'html_source=' . urlencode($this->htmlsource) . '&html_css=' . urlencode($css_content), 'POST');
if (empty($optimize_css)) {
$this->output->set_status_header(500);
diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index d7cb001a..d121d6a1 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -64,13 +64,14 @@ class api extends CI_Controller{
}
$orderData = explode(',',$orderIdListStr);
+
+ //$orderData = ['2005075526','2004125562','2005055512','2003305598'];
+
$returnData = new stdCLass();
$returnData->pending = array();
$returnData->processing = array();
$returnData->confirmed = array();
-
- //$orderData = ['2005075526','2004125562','2005055512'];
if(!empty($orderData)){
foreach($orderData as $itemId){
$orderInfo = new stdCLass();
@@ -82,41 +83,40 @@ class api extends CI_Controller{
$orderInfo->itinerary = array();
$coldSnArr = $this->BIZ_train_model->getAllColdSn($itemId);
$itineraryNums = count($coldSnArr);
- if($flag){
- foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
- $train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
- $orderInfo->itinerary[$keyColdSn] = new stdClass();
- $orderInfo->itinerary[$keyColdSn]->FOI_COLD_SN = $train_info->FOI_COLD_SN;
- $orderInfo->itinerary[$keyColdSn]->DepartureCity = $train_info->DepartureCity;
- $orderInfo->itinerary[$keyColdSn]->ArrivalCity = $train_info->ArrivalCity;
- $orderInfo->itinerary[$keyColdSn]->DepartureTime = date('H:i',strtotime($train_info->DepartureTime));
- $orderInfo->itinerary[$keyColdSn]->ArrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
- $ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
+
+ foreach ($coldSnArr as $keyColdSn=>$itemColdSn){
+ $train_info = $this->BIZ_train_model->biz_order_detail($itemColdSn->cold_sn);
+ $orderInfo->itinerary[$keyColdSn] = new stdClass();
+ $orderInfo->itinerary[$keyColdSn]->coldSn = $train_info->FOI_COLD_SN;
+ $orderInfo->itinerary[$keyColdSn]->departureCity = $train_info->DepartureCity;
+ $orderInfo->itinerary[$keyColdSn]->arrivalCity = $train_info->ArrivalCity;
+ $orderInfo->itinerary[$keyColdSn]->departureDate = date('Y-m-d',strtotime($train_info->DepartureDate));
+ $orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime));
+ $orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime));
+ $orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin;
+ $ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn);
+
+ if(!empty($ticketinfo)){
+ //获取子订单出票状态
+ $orderInfo->itinerary[$keyColdSn]->status = $ticketinfo->ts_status;
- if(!empty($ticketinfo)){
- //获取子订单出票状态
- $orderInfo->itinerary[$keyColdSn]->status = $ticketinfo->ts_status;
-
- //根据子订单状态确定总订单状态池
- if($ticketinfo->ts_status == 4 or $ticketinfo->ts_status == 7){
- $doTicketsNum++;
- }
+ //根据子订单状态确定总订单状态池
+ if($ticketinfo->ts_status == 4 or $ticketinfo->ts_status == 7){
+ $doTicketsNum++;
}
-
- }
- if($doTicketsNum == $itineraryNums){
- $orderInfo->topstatus = 'confirmed';
- array_push($returnData->confirmed,$orderInfo);
- }
-
- if($doTicketsNum < $itineraryNums){
- $orderInfo->topstatus = 'processing';
- array_push($returnData->processing,$orderInfo);
}
- }else{
+ }
+
+ if(!$flag){
$orderInfo->topstatus = 'pending';
array_push($returnData->pending,$orderInfo);
+ }elseif($doTicketsNum == $itineraryNums){
+ $orderInfo->topstatus = 'confirmed';
+ array_push($returnData->confirmed,$orderInfo);
+ }elseif($doTicketsNum < $itineraryNums){
+ $orderInfo->topstatus = 'processing';
+ array_push($returnData->processing,$orderInfo);
}
}
print_r(json_encode($returnData));
diff --git a/webht/third_party/dingtools/controllers/index.php b/webht/third_party/dingtools/controllers/index.php
index 6e7edfcb..fb9b6683 100644
--- a/webht/third_party/dingtools/controllers/index.php
+++ b/webht/third_party/dingtools/controllers/index.php
@@ -30,6 +30,7 @@ class index extends CI_Controller {
$postunionid = $this->input->post('postunionid');
$approvers = $this->input->post('approvers');
$message = $this->input->post('message');
+ $currency = $this->input->post('currency');
if(empty($postunionid)){
exit('参数错误');
@@ -65,7 +66,7 @@ class index extends CI_Controller {
$postData['approvers'] = $approversidstr;
$postData['form_component_values'] = array();
- $postData['form_component_values']['0']['name'] = '报账金额';
+ $postData['form_component_values']['0']['name'] = '金额';
$postData['form_component_values']['0']['value'] = $money;
$postData['form_component_values']['1']['name'] = '备注';
$postData['form_component_values']['1']['value'] = $message;
@@ -75,6 +76,8 @@ class index extends CI_Controller {
$postData['form_component_values']['3']['value'] = $paytocompany;
$postData['form_component_values']['4']['name'] = '附件';
$postData['form_component_values']['4']['value'] = json_decode($img);
+ $postData['form_component_values']['5']['name'] = '币种';
+ $postData['form_component_values']['5']['value'] = $currency;
//print_r(json_encode($postData));die();
$response = GetPost_http($url,json_encode($postData),'json');