From daee15dc6a1c79649e70a95b6f80eb3803aa328d Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 17 Jun 2019 23:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E5=8F=91=E9=80=81=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/vendorPlanSync/libraries/Tulanduo.php | 1 -
 webht/third_party/vendorPlanSync/models/Group_model.php | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index d02759bf..ec31d702 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -484,7 +484,6 @@ class Tulanduo
                 /** VendorArrangeState VAS_IsReceive */
                 $this->ci->Group_model->set_plan_received($vas_sn);
             }
-            echo ($this->ci->tldOrderBuilder->getBizContent());
         }
         if ( ! empty($pag_coldsn_arr)) {
             $this->biz_pag_order_exec($vas,$grd_info);
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 8c63ee14..1baa4bce 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -29,6 +29,9 @@ class Group_model extends CI_Model {
                     -- 上线初期避免已录入的重复
                     AND VAS_SN >=1688036
                     AND isnull(VAS_IsConfirm,0)=0 AND isnull(VAS_SendVary,0)=0
+                    and not exists (
+                        select 1 from VendorPlanSendout where VPS_VAS_SN=VAS_SN
+                    )
                     ";
         $sql .= " order by EOI_GetDate asc,vas.VAS_SendTime asc, vas.VAS_IsConfirm asc";
         return $this->HT->query($sql)->result();
@@ -121,7 +124,7 @@ class Group_model extends CI_Model {
                         $vgrd->ACI_BabyNum   = intval($vcold->COLD_BabyNum);
                         $vgrd->PAG_DEI_SN    = $vcold->PAG_DEI_SN;
                         $vgrd->PAG_sub_sn    = intval($vcold->COLD_ServiceSN2);
-                        $vgrd->vendor_memo   = trim($vcold->COLD_VendorMemo);
+                        $vgrd->vendor_memo   = trim($vcold->COLD_vendorMemo);
                         if ( strval($vcold->COLD_ServiceType)==='D') {
                             $vgrd->PAG_Code = mb_strtoupper($vcold->PAG_Code);
                             $vgrd->PAG_ExtendType = mb_strtoupper($vcold->PAG_ExtendType);