Merge branch 'master' of gitee.com:hainatravel/information-system

application/third_party/trainsystem/controllers/callback.php

@@ -213,7 +213,7 @@ class callback extends CI_Controller{
 				$find = array('车厢','号','上铺','中铺','下铺');
 				$replace = array('coach','',' upper',' middle',' lower');
 				$seatsinfo = str_replace($find,$replace,$ctrip_backdata->TrainOrderService->OrderInfo->TicketInfo->SeatNumber);
-				
+				$seatsinfo = mb_substr($seatsinfo,0,mb_strlen($seatsinfo,'UTF8')-1);
 				$seatsinfo_arr = explode(',',$seatsinfo);
 				
 				foreach($seatsinfo_arr as $item){

i.php

@@ -2,4 +2,7 @@
 phpinfo(); 
 
 
+
+
+
 ?>

webht/third_party/trippestOrderSync/controllers/vendor_money.php

@@ -38,7 +38,7 @@ class Vendor_money extends CI_Controller {
         $vendor_sourcetype = $this->trippest->vendor_sourcetype();
         // 不同地接社但是拼团号相同
         $actual_vendor_duplicate_combineno = $this->money_model->get_duplicate_vei_combineno($start_date, $end_date, implode(",", $vendors));
-        $duplicate_coli_sn = array_column($actual_vendor_duplicate_combineno, 'COLI_SN');
+        $duplicate_coli_sn = array_filter(array_column($actual_vendor_duplicate_combineno, 'COLI_SN'));
         if ($download_vendor !== null) {
             $vendors = array($download_vendor);
             $sourcetype = $vendor_sourcetype[strval($download_vendor)]["sourcetype"];