Merge branch 'feature/trippest'

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;