From 283a45fe4ba4326595c505083d4ed9b63521b927 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 6 Dec 2018 16:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=AD=97=E6=AE=B5,=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4[=E5=9C=B0=E6=8E=A5?=
 =?UTF-8?q?=E7=A4=BE=E4=B8=8A=E6=8A=A5=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4],=20=E9=A2=84=E7=95=99=E7=BB=99=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=98=AF=E5=90=A6=E7=A1=AE=E8=AE=A4=E6=97=B6?=
 =?UTF-8?q?=E7=94=A8(=E7=94=B1=E4=BA=8E=E5=9B=BE=E5=85=B0=E6=9C=B5?=
 =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E7=B3=BB=E7=BB=9F=E7=9A=84=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=96=E6=B6=88=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?,=E6=97=A0=E6=B3=95=E4=B8=8A=E6=8A=A5),=20=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E4=BA=8E=E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/vendorPlanSync/controllers/Tulanduo.php | 4 ++--
 webht/third_party/vendorPlanSync/controllers/index.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
index 0bbdc502..330f6b24 100644
--- a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
@@ -222,7 +222,7 @@ class Tulanduo extends CI_Controller
                ,"VPS_externalId" => $response->responseData->orderId
                ,"VPS_externalorderType" => $order_type
                ,"VPS_externalorderState" => $sync_orderstate
-               ,"VPS_latestTime" => date('Y-m-d H:i:s')
+               ,"VPS_sendTime" => date('Y-m-d H:i:s')
             );
             if ($vps_sn === 0) {
                 $sync_id = $this->Group_model->insert_VendorPlanSync($sync_ret);
@@ -505,7 +505,7 @@ class Tulanduo extends CI_Controller
                    ,"VPS_externalId" => $response->responseData->orderId
                    ,"VPS_externalorderType" => $order_type
                    ,"VPS_externalorderState" => $sync_orderstate
-                   ,"VPS_latestTime" => date('Y-m-d H:i:s')
+                   ,"VPS_sendTime" => date('Y-m-d H:i:s')
                 );
                 if ($vps_sn === 0) {
                     $sync_id = $this->Group_model->insert_VendorPlanSync($sync_ret);
diff --git a/webht/third_party/vendorPlanSync/controllers/index.php b/webht/third_party/vendorPlanSync/controllers/index.php
index ca5f618e..24fe5510 100644
--- a/webht/third_party/vendorPlanSync/controllers/index.php
+++ b/webht/third_party/vendorPlanSync/controllers/index.php
@@ -122,7 +122,7 @@ class Index extends CI_Controller {
             $ret['errMsg'] = "";
             $sync_arr = array(
                 "VPS_externalorderState" => 20
-                ,"VPS_latestTime" => date('Y-m-d H:i:s')
+                ,"VPS_updateTime" => date('Y-m-d H:i:s')
             );
             /** VendorPlanSync */
             $this->Group_model->update_VendorPlanSync($vps->VPS_SN, $sync_arr);
@@ -169,7 +169,7 @@ class Index extends CI_Controller {
             $err_code = $ret['err'];
             unset($ret['err']); // 不返回给接收方
             $sync_ret = array(
-               "VPS_latestTime" => date('Y-m-d H:i:s')
+               "VPS_updateTime" => date('Y-m-d H:i:s')
             );
             if ($err_code === 0) {
                 // 录入成功