|
|
|
|
@ -175,7 +175,9 @@ class Orders_model extends CI_Model {
|
|
|
|
|
|
|
|
|
|
public function get_groupCombineInfo_finance()
|
|
|
|
|
{
|
|
|
|
|
return array(); // 历史数据已获取完毕, 财务数据的获取方法待定 2018-11-30
|
|
|
|
|
// return array(); // 历史数据已获取完毕
|
|
|
|
|
$to_update_cost_date = date("Y-M-d", strtotime("-7 days"));
|
|
|
|
|
$last_update_time = date("Y-m-d 00:00:00");
|
|
|
|
|
$sql = " SELECT top 1 coli.COLI_ID, coli.COLI_SN, coli.COLI_GRI_SN, cold.COLD_SN, coli.COLI_OrderDetailText, coli.COLI_Memo,coli.COLI_State,coli.COLI_OPI_ID,
|
|
|
|
|
cold.COLD_PlanVEI_SN, cold.COLD_MemoText, gci.*,'1' as 'isHistory'
|
|
|
|
|
from GroupCombineInfo gci
|
|
|
|
|
@ -186,8 +188,12 @@ 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_travelDate between '2018-08-01' and '2018-08-31 23:59:59'
|
|
|
|
|
and gci.GCI_createTime < '2018-12-06 14:00:00'
|
|
|
|
|
-- 7天前的订单
|
|
|
|
|
and gci.gci_leaveDate = '$to_update_cost_date'
|
|
|
|
|
-- 今天更新一次
|
|
|
|
|
and gci.GCI_createTime < '$last_update_time'
|
|
|
|
|
-- 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 '%取消%'
|
|
|
|
|
";
|
|
|
|
|
$sql .= " ORDER BY isHistory ASC,GCI_createTime ASC ";
|
|
|
|
|
|