From 19002d3c67b78589fe15210408a954858248e5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 11 Nov 2019 15:43:57 +0800 Subject: [PATCH 1/3] push --- i.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/i.php b/i.php index dc5a1554..e416a555 100644 --- a/i.php +++ b/i.php @@ -2,4 +2,7 @@ phpinfo(); + + + ?> \ No newline at end of file From a851b6def698876f75ff4520001713509562c529 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 12 Nov 2019 14:09:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=8F=B7=E7=9A=84=E7=A9=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trippestOrderSync/controllers/vendor_money.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index 7772fec8..2650aab2 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/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"]; From b6bc03803a477e4ee0b010b0fc1b1f70333d6dc3 Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 12 Nov 2019 16:23:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/controllers/callback.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php index a2de5501..9c82ba8b 100644 --- a/application/third_party/trainsystem/controllers/callback.php +++ b/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){