From 0f88a69652c0ca3a75c85dcb30679feec88e12be Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 18 Dec 2019 15:02:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=97=E5=87=BA=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trippestOrderSync/helpers/array_helper.php | 2 +- .../trippestOrderSync/models/vendor_money_model.php | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/webht/third_party/trippestOrderSync/helpers/array_helper.php b/webht/third_party/trippestOrderSync/helpers/array_helper.php index 2c286fa7..1012fa78 100644 --- a/webht/third_party/trippestOrderSync/helpers/array_helper.php +++ b/webht/third_party/trippestOrderSync/helpers/array_helper.php @@ -182,7 +182,7 @@ function real_phone_number($phone, $nation_code) */ function async_curl($url, $second = 1) { - log_message('error','Webht Async Call: '. $url); + // log_message('error','Webht Async Call: '. $url); $ch = curl_init(); $curlVersion = curl_version(); $ua = "Webht (".PHP_OS.") PHP/".PHP_VERSION." CURL/".$curlVersion['version']." " . "AsyncJob"; diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 9066fda5..00d33cfd 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -477,7 +477,12 @@ class Vendor_money_model extends CI_Model { OR ( data_tmp.COLI_OPI_ID<>435 and TLD_total_price-TLD_agency_receipt-HT_haina_receipt<>0 - )"; + ) + OR exists ( + select 1 from groupcombineinfo + where gci_gri_sn=data_tmp.GRI_SN and ( GCI_createTime<'$expire_fresh' or GCI_combineNo is null) + ) + order by total_income_err desc,agency_receipt_err desc,HT_receipt_err desc"; $query = $this->HT->query($sql); return $query->result_array(); }