From b8b3d129aceaaff47575b01cd103e84f5505a04b Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 20 Nov 2019 18:36:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E6=8B=BC=E5=9B=A2=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/TulanduoApi.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index b43358e8..3d8a29a5 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -243,6 +243,16 @@ class TulanduoApi extends CI_Controller
             echo "cancel";
             return;
         }
+        if (mb_strstr($detail_jsonResp->orderDetail->agcOrderNo, "重复") !== false) {
+            /** groupcombineinfo */
+            $this->Order_update->gci_where_update = " GCI_VendorOrderId='" . $detail_jsonResp->orderDetail->orderId; // 不明确指定供应商id,出现过不对应的情况
+            $gci_update_column = array(
+                "GCI_createTime" => date('Y-m-d H:i:s')
+                ,"GCI_combineNo" => null
+            );
+            $gci_info = $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
+            return;
+        }
         if (isset($detail_jsonResp->orderDetail->agcOrderNo) && $detail_jsonResp->orderDetail->agcOrderNo!="") {
         } else {
             $detail_jsonResp->orderDetail->agcOrderNo = $detail_jsonResp->orderDetail->groupOrderNo;