diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 59b436b2..508afa42 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -124,9 +124,9 @@ class TulanduoApi extends CI_Controller continue; } $unique_order[] = $vo['orderId']; - $vo['agcOrderNo'] = mb_ereg_replace('(\s| )', '', $vo['agcOrderNo']); // 去掉中文的全角空格 + $vo['agcOrderNo'] = mb_ereg_replace('( )', '', trim($vo['agcOrderNo'])); // 去掉中文的全角空格 $PAG_Code = $pag_sub = null; - preg_match('^[a-zA-Z]+\-[0-9\-]+^', $this->characet($vo['routeName'], "UTF-8"), $temp_array); + preg_match('/[a-zA-Z]+\-[0-9\-]+/', $this->characet($vo['routeName'], "UTF-8"), $temp_array); if (empty($temp_array) && isset($pag_no_tmp[$vo['routeName']])) { // 旧的数据没有线路代号 log_message('error','未识别的线路名称 ' . $vo['orderId'] . " " . $vo['routeName'] . var_export($temp_array, 1)); @@ -646,11 +646,11 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId); public function analysis_groupCode($groupCode) { mb_regex_encoding("UTF-8"); - preg_match('^[\w\-]+^', $this->characet($groupCode, "UTF-8"), $temp_array); - $tmp_groupCode = explode("-", $temp_array[0]); + preg_match('/[\w\s\-]+/', $this->characet($groupCode, "UTF-8"), $temp_array); + $tmp_groupCode = explode("-", trim(strrchr($temp_array[0], " "))); $real_groupCode = $tmp_groupCode[0] . "-"; $real_groupCode .= mb_strstr($tmp_groupCode[1], "(", true) ? mb_strstr($tmp_groupCode[1], "(", true) : $tmp_groupCode[1]; - $real_groupCode = mb_ereg_replace('(\s| )', '', $real_groupCode); + $real_groupCode = mb_ereg_replace('( )', '', trim($real_groupCode)); return $real_groupCode; } diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 5c23f390..221970b9 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -172,7 +172,7 @@ class Orders_model extends CI_Model { INNER JOIN BIZ_ConfirmLineInfo coli ON gri.GRI_SN=coli.COLI_GRI_SN INNER JOIN VendorArrangeState vas ON vas.VAS_GRI_SN=coli.COLI_GRI_SN LEFT JOIN OperatorInfo opi ON opi.OPI_SN=coli.COLI_OPI_ID - WHERE vas.VAS_VEI_SN=? and gri.GRI_No LIKE '$groupCode%'"; + WHERE vas.VAS_VEI_SN=? and gri.GRI_No LIKE '%$groupCode%'"; $query = $this->HT->query($sql, array($vei_sn)); return $query->result(); } @@ -190,7 +190,7 @@ class Orders_model extends CI_Model { INNER JOIN ConfirmLineInfo coli ON gri.GRI_SN=coli.COLI_GRI_SN INNER JOIN VendorArrangeState vas ON vas.VAS_GRI_SN=coli.COLI_GRI_SN LEFT JOIN OperatorInfo opi ON opi.OPI_SN=coli.COLI_OPI_ID - WHERE vas.VAS_VEI_SN=? and gri.GRI_No LIKE '$groupCode%'"; + WHERE vas.VAS_VEI_SN=? and gri.GRI_No LIKE '%$groupCode%'"; $query = $this->HT->query($sql, array($vei_sn)); return $query->result(); } @@ -473,7 +473,7 @@ class Orders_model extends CI_Model { $sql = "SELECT top 1 COLI_SN,GRI_SN FROM BIZ_ConfirmLineInfo coli LEFT JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN - WHERE gri.GRI_No LIKE '$code%'"; + WHERE gri.GRI_No LIKE '%$code%'"; $query = $this->HT->query($sql); if ($query->row()) { $this->BIZ_COLI_SN = $query->row()->COLI_SN;