Merge branch 'feature/trippest'

feature/pay
lyt 6 years ago
commit 61c69e15a6

@ -176,7 +176,6 @@ class Orders_model extends CI_Model {
public function get_groupCombineInfo_finance()
{
// return array(); // 历史数据已获取完毕
// $to_update_cost_date = date("Y-m-d", strtotime("-45 days"));
$to_update_month_begin = date('Y-m-01', strtotime("-4 months", strtotime(date("Y-m-d"))));
$to_update_month_end = date('Y-m-01', strtotime("-3 months", strtotime(date("Y-m-d"))));
$end_d = strtotime($to_update_month_end)-1;
@ -193,8 +192,6 @@ 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')
-- 45天前的订单
--and gci.gci_leaveDate = '$to_update_cost_date'
-- 今天更新一次
and gci.GCI_createTime < '$last_update_time'
-- 已生成账单的不再自动同步

Loading…
Cancel
Save