From ddf9c709c656ebaf64f9a9ec306d62c7d22bbff6 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 12 Jul 2018 09:12:52 +0800 Subject: [PATCH] =?UTF-8?q?COLD=E5=92=8CGCI=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E6=83=85=E5=86=B5,?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=85=E5=8C=B9=E9=85=8DVendorOrderId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/TulanduoApi.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index ab00e002..4ee412a2 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/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