diff --git a/webht/third_party/vendorPlanSync/controllers/index.php b/webht/third_party/vendorPlanSync/controllers/index.php index 2d7124a4..a03d6726 100644 --- a/webht/third_party/vendorPlanSync/controllers/index.php +++ b/webht/third_party/vendorPlanSync/controllers/index.php @@ -32,11 +32,9 @@ class Index extends CI_Controller { public function push($GRI_SN=0, $vendor_str=null) { -// log_message('error',"\n\n---------------------------------------------------PUSH------------------------------------------------------------\n"); $start_date = date('Y-m-d'); $end_date = date('Y-m-d 23:59:59', strtotime("+2 months")); $ready_to_send = $this->Group_model->get_plan_not_received(1, $GRI_SN, $vendor_str, $start_date, $end_date); -// log_message('error',var_export($ready_to_send, 1)); if (empty($ready_to_send)) { return $this->output->set_output("empty"); } @@ -54,6 +52,7 @@ class Index extends CI_Controller { public function verify_user() { + return false; $open_id = $this->input->post('openId'); $open_key = $this->input->post('key'); $match = $this->UserAuth_model->if_user_key($open_id, $open_key, 1); @@ -80,6 +79,7 @@ class Index extends CI_Controller { */ public function uploadOperation() { + return false; $input = $this->input->post(); log_message('error',"Call [Tulanduo>uploadOperation]: " . json_encode($input)); $ret['status'] = -1; @@ -123,6 +123,7 @@ class Index extends CI_Controller { public function plan_confirm($input, $vps) { + return false; $ret['status'] = -1; $ret['errMsg'] = ""; $vendor_manager = $this->Group_model->get_vendorContact($input['openId']); @@ -160,6 +161,7 @@ class Index extends CI_Controller { public function fill_tourguide($input, $vps) { + return false; $ret['status'] = -1; $ret['errMsg'] = ""; $eva = $this->Group_model->get_plan_eva($vps->VAS_SN); @@ -198,6 +200,7 @@ class Index extends CI_Controller { public function calc_key($userId, $key) { + return false; $default = "b825e39422a54875a95752fc7ed6f5d2"; $ret = md5(hash("sha256", $userId.$default)); return $ret; diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index 8a9e1698..fff3a8e5 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php @@ -603,7 +603,7 @@ log_message('error',$resp); $date_s = new DateTime(strstr($vs->COLD_StartDate, " ", TRUE)); $date_e = new DateTime(strstr($vs->COLD_EndDate, " ", TRUE)); $date_d = $date_e->diff($date_s); - $d_t = ($date_d->format("%d")); + $d_t = ($date_d->format("%a")); if ($d_t > 0) { for ($d_i=0; $d_i < ($d_t+1); $d_i++) { $f_d = date('Y-m-d', strtotime("+$d_i day", strtotime(substr($vs->COLD_StartDate, 0, 10)))); diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index 9c714014..522e50ec 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/webht/third_party/vendorPlanSync/models/Group_model.php @@ -22,7 +22,7 @@ class Group_model extends CI_Model { inner join GRoupInfo gri on GRI_SN=VAS_GRI_SN where 1=1 AND VAS_VEI_SN in ($vendor_str) "; $sql .= $gri_sn!==0 ? $gri_sql : " - AND isnull(VAS_IsCancel,0)=0 AND isnull(VAS_Delete,0)=0 AND isnull(vas,0).DeleteFlag=0 + AND isnull(VAS_IsCancel,0)=0 AND isnull(VAS_Delete,0)=0 AND isnull(vas.DeleteFlag,0)=0 AND VAS_IsSendSucceed=1 AND isnull(VAS_IsReceive,0)=0 AND EOI_GetDate between '$start_date' AND '$end_date' -- Trippest, not confirm, not change -- for Trippest deploy