diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index d6a77a74..600d616f 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -456,8 +456,8 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId); $ret['errMsg'] = "未知错误"; $input = $this->input->post(); // todo 验证userID - // $vendorID = $input['userId']; - $vendorID = 29188;//29188 1343; // test + $vendorID = $input['userId']; + // $vendorID = 29188;//29188 1343; // test $vas_info = $this->Orders_model->get_vendorarrangestate_byVendor($input['orderId'], $vendorID); if (empty($vas_info) && ! empty($input['agcOrderNo'])) { $real_groupCode = $this->analysis_groupCode($input['agcOrderNo']); @@ -483,7 +483,19 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId); if ($ret['status'] !== 1) { log_message('error','图兰朵确认上报失败. POST RAW: ' . raw_json_encode($input) . "; Result: " . raw_json_encode($ret)); } - // todo email 外联 + $sender_name = "中华游供应商合作平台"; + $sender_mail = "info@chinahighlights.net"; + $from_name = $vendor_manager->LMI2_Name; + $from_mail = $vendor_manager->LMI_ListMail; + $to_name = $vas_info[0]->OPI_Name; + $to_mail = $vas_info[0]->OPI_Email; + $subject = $input['agcOrderNo'] . "团已确认: " . $vendor_manager->VEI2_CompanyBN; + $mail_body = $vendor_manager->VEI2_CompanyBN . "对团" . $input['agcOrderNo'] . "的计划在" . $input['orderTime'] . "已确认。\r\n"; + $mail_body .= "确认说明：" . $input['orderRemark'] . "\r\n"; + $mail_body .= "确认人：$vendor_manager->LMI2_Name $vendor_manager->LMI_ListMail 固定电话: $vendor_manager->LMI_Telephone 移动电话:$vendor_manager->LMI_Mobile\r\n"; + $mail_body .= "变更内容: " . $vas_info[0]->VAS_ChangeText . "\r\n"; + $this->Orders_model->save_automail($sender_name, $sender_mail, $from_name, $from_mail, $to_name, $to_mail, $subject, $mail_body, $sender_name); + return $this->output->set_content_type('application/json')->set_output(json_encode($ret)); } diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 5cca3c03..15ea7c69 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -148,11 +148,12 @@ class Orders_model extends CI_Model { */ public function get_vendorarrangestate_byVendor($vendorOrderId, $vei_sn) { - $sql = "SELECT coli.COLI_ID, coli.COLI_SN, + $sql = "SELECT coli.COLI_ID, coli.COLI_SN,opi.OPI_Email,opi.OPI_Name, vas.VAS_ChangeText, vas.VAS_ConfirmInfo, vas.VAS_SN FROM BIZ_GroupCombineInfo gci INNER JOIN BIZ_ConfirmLineInfo coli ON gci.GCI_GRI_SN=coli.COLI_GRI_SN INNER JOIN VendorArrangeState vas ON vas.VAS_GRI_SN=coli.COLI_GRI_SN + LEFT JOIN OperatorInfo opi ON opi.OPI_SN=coli.COLI_OPI_ID WHERE gci.GCI_VendorOrderId=? and vas.VAS_VEI_SN=? "; $query = $this->HT->query($sql, array($vendorOrderId, $vei_sn)); return $query->result(); @@ -164,11 +165,12 @@ class Orders_model extends CI_Model { */ public function get_vendorarrangestate_byGroup($groupCode, $vei_sn) { - $sql = "SELECT coli.COLI_ID, coli.COLI_SN, + $sql = "SELECT coli.COLI_ID, coli.COLI_SN,opi.OPI_Email,opi.OPI_Name, vas.VAS_ChangeText, vas.VAS_ConfirmInfo, vas.VAS_SN FROM GRoupInfo gri INNER JOIN BIZ_ConfirmLineInfo coli ON gri.GRI_SN=coli.COLI_GRI_SN INNER JOIN VendorArrangeState vas ON vas.VAS_GRI_SN=coli.COLI_GRI_SN + LEFT JOIN OperatorInfo opi ON opi.OPI_SN=coli.COLI_OPI_ID WHERE vas.VAS_VEI_SN=? and gri.GRI_No LIKE '$groupCode%'"; $query = $this->HT->query($sql, array($vei_sn)); return $query->result(); @@ -464,8 +466,10 @@ class Orders_model extends CI_Model { lmi.LMI_Telephone, lmi.LMI_Mobile, lmi.LMI_ListMail + ,vei2.VEI2_CompanyBN FROM LinkmanInfo lmi INNER JOIN LinkManInfo2 lmi2 ON lmi2.LMI2_LMI_SN=lmi.LMI_SN AND lmi2.LMI2_LGC=2 + INNER JOIN VEndorInfo2 vei2 ON vei2.VEI2_VEI_SN=LMI_VEI_SN AND VEI2_LGC=2 WHERE LMI_Receiver='Yes' AND LMI_VEI_SN=$vendorID"; $query = $this->HT->query($sql); return $query->row(); @@ -1338,20 +1342,24 @@ class Orders_model extends CI_Model { /* * 发送邮件 */ - - function SendMail($fromName, $fromEmail, $toName, $toEmail, $subject, $body) { - $sql = "INSERT INTO Email_AutomaticSend \n" - . " ( \n" - . " M_ReplyToName, M_ReplyToEmail, M_ToName, M_ToEmail, M_Title, M_Body, M_Web, \n" - . " M_FromName, M_State \n" - . " ) \n" - . "VALUES \n" - . " ( \n" - . " ?, ?, ?, ?, ?, N?, ?, ?, 0 \n" - . " ) "; - $query = $this->HT->query($sql, - array(substr($fromName, 0, 127), $fromEmail, substr($toName, 0, 127), $toEmail, $subject, $body, $this->config->item('Site_Code'), $this->config->item('Site_SenderName')) - ); + public function save_automail($M_SenderName, $M_SenderEmail, $fromName, $fromEmail, $toName, $toEmail, $subject, $body, $frominfo = 'vendorConfirm msg', $M_RelatedInfo = '', $M_State = 0, $M_AddTime = '', $M_Web = 'vendorConfirm msg') { + $sql = "INSERT INTO + Email_AutomaticSend ( + M_SenderName, + M_SenderEmail, + M_ReplyToName, + M_ReplyToEmail, + M_ToName, + M_ToEmail, + M_Title, + M_Body, + M_Web, + M_FromName, + M_ServiceSN, + M_State, + M_AddTime + ) VALUES (N?, N?, N?, N?, N?, N?, N?, N?, ?, N?, ?,?,getdate()) "; + $query = $this->HT->query($sql, array($M_SenderName, $M_SenderEmail, $fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_Web, $frominfo, $M_RelatedInfo, $M_State)); return $query; }