diff --git a/application/third_party/htmlcompressor/views/amp-template/ah.php b/application/third_party/htmlcompressor/views/amp-template/ah.php
index bf0ee52f..ce7d0666 100644
--- a/application/third_party/htmlcompressor/views/amp-template/ah.php
+++ b/application/third_party/htmlcompressor/views/amp-template/ah.php
@@ -61,7 +61,8 @@
- THAILAND
- VIETNAM
- - MYANMAR
+ - MYANMAR
+ - JAPAN
- CAMBODIA
- LAOS
- SOUTHEAST ASIA
diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index d02759bf..c7338520 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);
@@ -564,9 +563,14 @@ class Tulanduo
// echo json_encode($grd_apart_info);exit;
$request_info = $this->ci->Group_model->get_plan_request($vas->GRI_SN);
$big_order_index = 0;
+ $expect_order_cnt = count($grd_apart_info['com'])+intval(!empty($grd_apart_info['big_pvt']))+intval(!empty($grd_apart_info['pvt']));
foreach ($grd_apart_info as $group_key => $grd_part) {
$big_order_index = $this->tour_apart_order_exec($group_key, $vas, $request_info, null, $grd_part, $big_order_index);
}
+ if ($big_order_index === $expect_order_cnt) {
+ /** VendorArrangeState VAS_IsReceive */
+ $this->ci->Group_model->set_plan_received($vas->VAS_SN);
+ }
}
/*!
@@ -898,7 +902,7 @@ class Tulanduo
$this->ci->BIZ_order->insert_biz_order_log($coli_sn, "vendorPlanUpdateSendout_" . $tour_code);
}
/** VendorArrangeState VAS_IsReceive */
- $this->ci->Group_model->set_plan_received($vas_sn);
+ $this->ci->Group_model->set_plan_received($vas_sn, $gri_sn);
}
}
return "[Tulanduo>push_trippest] Done. " . $COLI_ID;
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 8c63ee14..d3d0b41a 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);
@@ -293,10 +296,13 @@ class Group_model extends CI_Model {
return $eva_g_sn;
}
- public function set_plan_received($vas_sn=0)
+ public function set_plan_received($vas_sn=0, $gri_sn=null)
{
- $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_SN=? ";
- return $this->HT->query($sql, array($vas_sn));
+ $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_SN=$vas_sn ";
+ if ($gri_sn !== null) {
+ $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_GRI_SN=$gri_sn ";
+ }
+ return $this->HT->query($sql);
}
/*!