trippest获取历史订单; 排除商旅组团号; 增加未识别产品;拆分团修改团号问题

webht/third_party/trippestOrderSync/helpers/array_helper.php

@@ -117,8 +117,9 @@ function raw_json_encode($input, $flags = 0) {
 function analysis_groupCode($groupCode)
 {
     mb_regex_encoding("UTF-8");
+    $groupCode = trim_groupCode(trim($groupCode));
     preg_match('/[\w\s\-]+/', characet($groupCode, "UTF-8"), $temp_array);
-    $temp_array[0] = strrchr($temp_array[0], " ") ? mb_strstr($temp_array[0], " ",true) : $temp_array[0];
+    // $temp_array[0] = strrchr($temp_array[0], " ") ? mb_strstr($temp_array[0], " ",true) : $temp_array[0];
     $tmp_groupCode  = explode("-", trim($temp_array[0]));
     $real_groupCode = $tmp_groupCode[0];
     if (isset($tmp_groupCode[1])) {
@@ -131,9 +132,13 @@ function analysis_groupCode($groupCode)
         $real_groupCode .= mb_strstr($tmp_groupCode[$i], "（", true)!==false ? mb_strstr($tmp_groupCode[$i], "（", true) : $tmp_groupCode[$i];
       }
     }
-    $real_groupCode = mb_ereg_replace('(　)', '', trim($real_groupCode));
+    $real_groupCode = trim_groupCode(trim($real_groupCode));
     return $real_groupCode;
 }
+function trim_groupCode($groupCode)
+{
+    return mb_ereg_replace('(　| | )', '', $groupCode);
+}
 /*!
  * 转换字符集编码
  * @param $data

webht/third_party/trippestOrderSync/models/orders_model.php

@@ -131,7 +131,7 @@ class Orders_model extends CI_Model {
      */
     public function get_groupCombineInfo($coli_sn=0, $get_vendorID=null, $startDate=null, $endDate=NULL)
     {
-        $sql = "SELECT top 10 coli.COLI_ID, coli.COLI_SN, coli.COLI_GRI_SN, cold.COLD_SN, coli.COLI_OrderDetailText, coli.COLI_Memo,coli.COLI_State,coli.COLI_OPI_ID,
+        $sql = "SELECT top 1 coli.COLI_ID, coli.COLI_SN, coli.COLI_GRI_SN, cold.COLD_SN, coli.COLI_OrderDetailText, coli.COLI_Memo,coli.COLI_State,coli.COLI_OPI_ID,
         cold.COLD_PlanVEI_SN, gci.*
                 FROM GroupCombineInfo gci
                 LEFT JOIN BIZ_ConfirmLineInfo coli ON coli.COLI_GRI_SN=gci.GCI_GRI_SN --and coli.COLI_State NOT IN ('30','40','50')
@@ -267,7 +267,7 @@ class Orders_model extends CI_Model {
             $this->GRI_Creator,
             $this->GRI_OrderType
         ));
-        $this->GRI_SN = $this->HT->query("select MAX(GRI_SN) as insert_id FROM GRoupInfo WHERE GRI_No='" . $this->GRI_No . "'")->row('insert_id');
+        $this->GRI_SN = $this->HT->query("select MAX(GRI_SN) as insert_id FROM GRoupInfo WHERE GRI_operator=435 AND GRI_No='" . $this->GRI_No . "'")->row('insert_id');
         return $this->GRI_SN;
     }
 
@@ -526,7 +526,7 @@ class Orders_model extends CI_Model {
               inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=COLI_SN --and COLI_State not in (30,40,50)
               LEFT JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN and GRI_OrderType=227002
                 and gri.GRI_operator<>435 and gri.GRI_operator is not null
-              WHERE gri.GRI_No LIKE '%$code%'
+              WHERE coli.COLI_Department=30 and gri.GRI_No LIKE '%$code%'
               order by COLI_SN desc"; // and gri.GRI_Name like '%$NoName%'
       $query = $this->HT->query($sql);
       if ($query->num_rows() > 0) {
@@ -555,7 +555,7 @@ class Orders_model extends CI_Model {
                 FROM BIZ_ConfirmLineInfo coli
                 inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=COLI_SN
                 left JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN and GRI_OrderType=227002
-                WHERE gri.GRI_No LIKE '%$code%'
+                WHERE coli.COLI_Department=30 and gri.GRI_No LIKE '%$code%'
                 order by case COLI_OPI_ID when 435 then 1 else 0 end asc,COLI_SN desc";
         $query = $this->HT->query($sql);
         return $query->result();

webht/third_party/trippestOrderSync/models/tulanduo_sync_model.php

@@ -0,0 +1,59 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Tulanduo_sync_model extends CI_Model {
+
+    function __construct() {
+        parent::__construct();
+        $this->HT = $this->load->database('HT', TRUE);
+    }
+
+    /*!
+     * 查询图兰朵订单id是否已存在
+     * @param  string     $vendorOrderIds [description]
+     */
+    public function get_exists_vendorOrderId($vendorOrderIds="")
+    {
+        $sql = "SELECT GCI_VendorOrderId FROM GroupCombineInfo
+                WHERE GCI_VendorOrderId IN ($vendorOrderIds) ";
+        return $this->HT->query($sql)->result();
+    }
+    /*!
+     * 从图兰朵同步历史数据的日期偏移
+     * 获取HT内图兰朵订单的最老出发日期
+     * * 由于获取列表时根据发团日期或得到更早时间的发团日期
+     * * 因此这里取最早的10个, 找出不连续的为滚动日期的开始
+     */
+    public function get_oldest_offset()
+    {
+        $sql = "SELECT DISTINCT TOP 10 CAST(GCI_travelDate as DATE) old_date from GroupCombineInfo
+                order by old_date asc";
+        $all_date = $this->HT->query($sql)->result();
+        $all_date_arr = array_map(function($ele)
+        {
+            return $ele->old_date;
+        }, $all_date);
+        for ($i=count($all_date_arr)-1; $i > 0; $i--) {
+            $d1 = new DateTime($all_date_arr[$i]);
+            $d2  = new DateTime($all_date_arr[$i-1]);
+            $date_diff  = $d2->diff($d1);
+            if (intval($date_diff->format('%R%a')) > 1) {
+                return $all_date_arr[$i];
+            }
+        }
+        return $all_date_arr[0];
+    }
+    /*!
+     * 图兰朵订单在HT内的信息
+     * @param  [type]     $code          [description]
+     * @param  [type]     $vendorOrderId [description]
+     */
+    public function get_vendorOrder_HTinfo($code, $vendorOrderId=NULL)
+    {
+        # code...
+    }
+
+}
+
+/* End of file tulanduo_sync_model.php */
+/* Location: ./webht/third_party/trippestOrderSync/models/tulanduo_sync_model.php */