diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 811968b7..36811535 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -1197,6 +1197,7 @@ class TulanduoApi extends CI_Controller // ,=> ,"西安精品一日游(目的地)" => "XASIC-41" ,"西安精品一日游PVT(目的地)" => "XASIC-41" + ,"西安市内精华一日游(目的地)" => "XASIC-41" ,"西安市内精品一日游(目的地)" => "XASIC-41" ,"西安精品两日游(目的地)" => "XASIC-42" ,"西安单租车服务(目的地)" => "XASIC-17" @@ -1205,6 +1206,7 @@ class TulanduoApi extends CI_Controller ,"西安兵马俑精品一日游(目的地)" => "XASIC-41" ,"西安兵马俑精华一日游(目的地)" => "XASIC-41" ,"西安兵马俑精品半日游(目的地)" => "XASIC-15" + ,"西安兵马俑精华半日游(目的地)" => "XASIC-15" ,"西安兵马俑精品半日游PVT(目的地)" => "XASIC-15" ,"西安汉阳陵市内精品一日游(目的地)" => "XASIC-42" // ,=> diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index b5522e5b..4c11c095 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -186,17 +186,9 @@ class Orders_model extends CI_Model { LEFT JOIN BIZ_ConfirmLineDetail cold ON cold.COLD_COLI_SN=coli.COLI_SN where GCI_combineNo is not null and GCI_combineNo not in ('cancel','forbidden') - and GCI_leaveDate < '" . date('Y-m-d', strtotime("-7 days")) . "' - and gci.GCI_createTime < '" . date('Y-m-d') . "' +and GCI_travelDate between '2018-08-01' and '2018-08-31 23:59:59' +and gci.GCI_createTime < '2018-12-06 14:00:00' and GCI_combineNo not like '%取消%' - and not exists ( - select GCOD_SN from GroupCombineOperationDetail gcod where gcod.GCOD_GCI_combineNo=GCI_combineNo - ) - and 0 < ( - select sum(isnull(COLD_PersonNum,0)+isnull(COLD_ChildNum,0)+isnull(COLD_BabyNum,0)) person from BIZ_ConfirmLineInfo - inner join BIZ_ConfirmLineDetail on COLD_COLI_SN=COLI_SN - where COLI_GRI_SN=gri_sn - ) "; $sql .= " ORDER BY isHistory ASC,GCI_createTime ASC "; $query = $this->HT->query($sql);