COLD和GCI供应商不一致的情况,更新仅匹配VendorOrderId

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -223,7 +223,7 @@ class TulanduoApi extends CI_Controller
                 /*biz_groupcombineinfo*/
                 $this->Orders_model->GCI_combineNo     = isset($vo['groupOrderNo']) ? $vo['groupOrderNo'] : '';
                 $this->Orders_model->GCI_GRI_SN        = $this->Orders_model->GRI_SN;
-                $this->Orders_model->GCI_VEI_SN        = $this->Orders_model->COLD_PlanVEI_SN;
+                $this->Orders_model->GCI_VEI_SN        = $this->city_info[$vo['operationDep']]['PlanVEI_SN'] ? $this->city_info[$vo['operationDep']]['PlanVEI_SN'] : 1343;
                 $this->Orders_model->GCI_VendorOrderId = $vo['orderId'];
                 $this->Orders_model->GCI_FromAgc       = $vo['agcName'];
                 $this->Orders_model->GCI_groupType     = $vo['orderType'];
@@ -328,7 +328,8 @@ class TulanduoApi extends CI_Controller
                 $this->order_cancel($order->COLI_ID);
             }
             /** biz_groupcombineinfo */
-            $this->Order_update->gci_where_update = " GCI_VEI_SN=$vei_SN and GCI_VendorOrderId='" . $detail_jsonResp->orderDetail->orderId . "'";
+            // $this->Order_update->gci_where_update = " GCI_VEI_SN=$vei_SN and GCI_VendorOrderId='" . $detail_jsonResp->orderDetail->orderId . "'";
+            $this->Order_update->gci_where_update = " GCI_VendorOrderId='" . $detail_jsonResp->orderDetail->orderId . "'";
             $gci_update_column = array(
                 "GCI_combineNo"   => isset($detail_jsonResp->orderDetail->groupOrderNo) ? $detail_jsonResp->orderDetail->groupOrderNo : null
                 ,"GCI_VEI_SN"     => $vei_SN