diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 288a36e1..0aaaaf0d 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -154,7 +154,7 @@ class TulanduoApi extends CI_Controller $PAG_Code = $split_code[0] . "-" . $split_code[1]; isset($split_code[2]) ? $pag_sub=$split_code[2] : null; // 旧的数据没有线路代号 - log_message('error',"未识别的线路名称 $PAG_Code" . $vo['orderId'] . " " . $vo['routeName'] . var_export($temp_array, 1)); + log_message('error',"未识别的线路名称 $PAG_Code " . $vo['orderId'] . " " . $vo['routeName'] . var_export($temp_array, 1)); } else { $PAG_Code = $pag_sub = null; $split_code = explode("-", $temp_array[0]); @@ -277,8 +277,8 @@ class TulanduoApi extends CI_Controller } else { // $startDate = ('2018-04-21'); // $endDate = ('2018-04-22'); // test - $startDate = date('Y-m-d', strtotime("-3 days")); - $endDate = date('Y-m-d', strtotime("+7 days")); + $startDate = date('Y-m-d', strtotime("-4 days")); + $endDate = date('Y-m-d', strtotime("+2 days")); $to_update_list = $this->Orders_model->get_groupCombineInfo(0, null, $startDate, $endDate); } $unique_orderGroupCombine = array(); diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 35e701c9..308fa230 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -130,7 +130,7 @@ class Orders_model extends CI_Model { */ public function get_groupCombineInfo($coli_sn=0, $get_vendorID=null, $startDate=null, $endDate=NULL) { - $sql = "SELECT top 1000 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, + $sql = "SELECT top 10 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, gci.* FROM GroupCombineInfo gci LEFT JOIN BIZ_ConfirmLineInfo coli ON coli.COLI_GRI_SN=gci.GCI_GRI_SN and coli.COLI_State NOT IN ('30','40','50') @@ -143,8 +143,9 @@ class Orders_model extends CI_Model { $sql .= " and GCI_VendorOrderId='$get_vendorID' "; } if ($startDate !== NULL) { - $sql .= " and gci.GCI_travelDate between '$startDate' and '$endDate' "; // test + $sql .= " and gci.GCI_travelDate between '$startDate' and '$endDate' "; } + $sql .= " order by GCI_createTime asc "; // $sql .= "UNION SELECT top 50 // 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, gci.*