From e119d59367a58e890144d9282a6005da01ed6686 Mon Sep 17 00:00:00 2001 From: Janie <109517022+Janie06@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:05:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?SE=20Cancel=20Booking=20Notify=20To=20User?= =?UTF-8?q?=20Mail=E6=A8=A3=E5=BC=8F=E9=96=8B=E7=99=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EasyBL.WEBAPP/ShowEasy/BookingMail.cs | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs index a61d7d2..c316a50 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs @@ -1662,6 +1662,148 @@ namespace EasyBL.WEBAPP.SYS } + //SE Cancel Order Notify To User + public string SECancelOrderNotifyToUser() + { + + StringBuilder sb = new StringBuilder(); + + EmailTemplate_CH mailTemplate = new EmailTemplate_CH(); + //var Server = Common.ConfigGetValue("", "ida:RedirectUri"); + + sb.Append(mailTemplate.MailHeader()); + sb.Append(mailTemplate.MailCSS()); + sb.Append(mailTemplate.MailShowEasyLogo()); + //Email Body + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + //如果按鈕無法點擊 (連結記得改成要打的API) + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append("
"); + sb.Append(" "); + //Text：你好 xxx， + sb.Append(""); + sb.Append(""); + sb.Append(""); + //Text：我們正在處理您的退款 + sb.Append(""); + sb.Append(""); + sb.Append(""); + //Text：訂單資訊 + sb.Append(""); + sb.Append(""); + sb.Append(""); + //Button：service card start ---------------------------------------------------- + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append("
"); + sb.Append("

"); + sb.Append("你好，" + "Janie" + "，"); + sb.Append("

"); + sb.Append("
"); + sb.Append("

"); + sb.Append("ShowEasy 已取消此訂單，若您已付款將為您進行退款流程。
"); + sb.Append("
"); + sb.Append("若有任何問題，您可以"); + sb.Append("
"); + sb.Append("撥打 +886-2 27255000"); + sb.Append("
"); + sb.Append("發送 Email: info@showeasy.com。"); + sb.Append("
"); + sb.Append("
"); + sb.Append("ShowEasy 客服時間："); + sb.Append("週一至週五：9:00~18:00 (台灣時區)"); + sb.Append("

"); + sb.Append("
"); + sb.Append("

"); + sb.Append("訂單資訊："); + sb.Append("

"); + sb.Append("
"); + sb.Append(""); + sb.Append(""); + sb.Append(""); + //service img + sb.Append(""); + //booking status + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append("
"); + sb.Append(""); + //sb.Append(Img); + sb.Append("\" width = '30' height = '30'"); + sb.Append(""); + sb.Append("

"); + //sb.Append("取消訂單, " + PaymentStatus); + sb.Append("

"); + //service name + sb.Append("

"); + //sb.Append(ServiceName); + sb.Append("

"); + //booking number + sb.Append("

"); + //sb.Append(BookingNo); + sb.Append("

"); + //BookingItem + sb.Append("

"); + sb.Append("接送服務, 台北市, 四人座車型 x 1"); + sb.Append("

"); + //var lstT = new List(); + //var objval = BookingItem.ToString(); + //if (!string.IsNullOrEmpty(objval) && objval != "[]") + //{ + // lstT = JsonConvert.DeserializeObject>(objval.ToString()); + //} + //foreach (var item in lstT) + //{ + // sb.Append("

"); + // sb.Append(item); + // sb.Append("

"); + //} + //service time + sb.Append("

"); + sb.Append("服務時間: "); + sb.Append("

"); + //booking time + sb.Append("

"); + sb.Append("訂購時間: "); + sb.Append("

"); + //cost + sb.Append("

"); + sb.Append("$"); + sb.Append("

"); + //sb.Append(""); + sb.Append(""); + sb.Append("查看訂單"); + sb.Append(""); + sb.Append("
"); + sb.Append("
"); + sb.Append("
"); + sb.Append("如果按鈕無法點擊，你可以直接點擊"); + sb.Append("

"); + sb.Append(""); + sb.Append("這裡"); + sb.Append(""); + sb.Append("

"); + sb.Append("
"); + //sb.Append(mailTemplate.MailButtom()); + sb.Append(mailTemplate.MailFooter()); + + return sb.ToString(); + + } + } } \ No newline at end of file From e47ae77b36da08218c66d3f0db92302fff588eba Mon Sep 17 00:00:00 2001 From: alina <1449359159@qq.com> Date: Wed, 15 Mar 2023 17:53:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=8D=E5=8B=99=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E9=87=91=E9=A1=8D=E8=A6=8F=E5=89=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowEasy/ONSiteMaintain_UpdService.cs | 128 +++--------------- 1 file changed, 22 insertions(+), 106 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs index f54cd47..be5836a 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs @@ -1054,34 +1054,28 @@ namespace EasyBL.WEBAPP.ShowEasy } // UpdMinPrice(i_crm.ORIGID, oEntity.ServiceID, oEntity.LangID); - int? MinPrice = int.MaxValue; var saONSiteBaseInfo = db.Queryable().Where(x => x.OrgID == i_crm.ORIGID && x.ServiceID == oEntity.ServiceID && x.LangID == oEntity.LangID).Select(x => x.Guid).ToList(); if (saONSiteBaseInfo.Count > 0) { - - var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); - if (ServiceCostRulesPrice < MinPrice) + var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price * SqlFunc.IIF(x.PricingMode == "N", 1, SqlFunc.ToDouble(x.Weight_Min))); + if (ServiceCostRulesPrice != null) { - MinPrice = ServiceCostRulesPrice; + if (Convert.ToInt32(ServiceCostRulesPrice) < MinPrice) + { + MinPrice = Convert.ToInt32(ServiceCostRulesPrice); + } } - var ServiceTruckCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); - if (ServiceTruckCostRulesPrice < MinPrice) { MinPrice = ServiceTruckCostRulesPrice; } var ONSiteOtherCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.ONSiteItemID)).Min(x => x.Price); - if (ONSiteOtherCostRulesPrice < MinPrice) { MinPrice = ONSiteOtherCostRulesPrice; } - - - - } else { @@ -1124,72 +1118,7 @@ namespace EasyBL.WEBAPP.ShowEasy #endregion Onsite管理編輯（新增） - /// - /// 更新最低金額 - /// - /// - /// - private void UpdMinPrice(string sOrgID,string sServiceID,string sLangID) - { - int? MinPrice = int.MaxValue; - var db = SugarBase.GetIntance(); - - try - { - - var saONSiteBaseInfo = db.Queryable().Where(x => x.OrgID == sOrgID && x.ServiceID == sServiceID && x.LangID == sLangID).Select(x => x.Guid).ToList(); - if (saONSiteBaseInfo.Count > 0) - { - - var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); - if (ServiceCostRulesPrice < MinPrice) - { - MinPrice = ServiceCostRulesPrice; - } - - var ServiceTruckCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); - - if (ServiceTruckCostRulesPrice < MinPrice) - { - MinPrice = ServiceTruckCostRulesPrice; - } - var ONSiteOtherCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.ONSiteItemID)).Min(x => x.Price); - - if (ONSiteOtherCostRulesPrice < MinPrice) - { - MinPrice = ONSiteOtherCostRulesPrice; - } - - - - - } - else - { - - MinPrice = 0; - } - //更新最低金額 - var oONSiteBaseInfo = db.Queryable().Single(x => x.OrgID == sOrgID && x.ServiceID == sServiceID && x.LangID == sLangID); - - oONSiteBaseInfo.MinPrice = MinPrice; - var iRel = db.Updateable(oONSiteBaseInfo) - .UpdateColumns(x => new - { - x.MinPrice - }).ExecuteCommand(); - - - } - catch (Exception ex) - { - var sMsg = Util.GetLastExceptionMsg(ex); - - - } - - - } + #region Plan（修改） @@ -1379,11 +1308,13 @@ namespace EasyBL.WEBAPP.ShowEasy var saONSiteBaseInfo = db.Queryable().Where(x => x.OrgID == i_crm.ORIGID && x.ServiceID == oEntity.ServiceID && x.LangID == oEntity.LangID).Select(x => x.Guid).ToList(); if (saONSiteBaseInfo.Count > 0) { - - var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); - if (ServiceCostRulesPrice < MinPrice) + var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price * SqlFunc.IIF(x.PricingMode == "N", 1, SqlFunc.ToDouble(x.Weight_Min))); + if (ServiceCostRulesPrice != null) { - MinPrice = ServiceCostRulesPrice; + if (Convert.ToInt32(ServiceCostRulesPrice) < MinPrice) + { + MinPrice = Convert.ToInt32(ServiceCostRulesPrice); + } } var ServiceTruckCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); @@ -1398,10 +1329,6 @@ namespace EasyBL.WEBAPP.ShowEasy { MinPrice = ONSiteOtherCostRulesPrice; } - - - - } else { @@ -1780,12 +1707,8 @@ namespace EasyBL.WEBAPP.ShowEasy var sServiceID = _fetchString(i_crm, @"ServiceID"); var sLangID = _fetchString(i_crm, @"LangID"); var sPlanID = _fetchString(i_crm, @"PlanID"); - var iRel = db.Deleteable().Where(x => x.Guid == sPlanID && x.ServiceID == sServiceID && x.LangID == sLangID).ExecuteCommand(); - - - - var iRel1 = db.Deleteable().Where(x => x.QSID == sPlanID).ExecuteCommand(); + var iRel1 = db.Deleteable().Where(x => x.QSID == sPlanID).ExecuteCommand(); iRel1 = db.Deleteable().Where(x => x.QSID == sPlanID).ExecuteCommand(); iRel1 = db.Deleteable().Where(x => x.QSID == sPlanID).ExecuteCommand(); iRel1 = db.Deleteable().Where(x => x.QSID == sPlanID).ExecuteCommand(); @@ -1796,11 +1719,14 @@ namespace EasyBL.WEBAPP.ShowEasy var saONSiteBaseInfo = db.Queryable().Where(x => x.OrgID == i_crm.ORIGID && x.ServiceID == sServiceID && x.LangID == sLangID).Select(x => x.Guid).ToList(); if (saONSiteBaseInfo.Count > 0) { - - var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); - if (ServiceCostRulesPrice < MinPrice) + var ServiceCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price * SqlFunc.IIF(x.PricingMode == "N", 1, SqlFunc.ToDouble(x.Weight_Min))); + if (ServiceCostRulesPrice != null) { - MinPrice = ServiceCostRulesPrice; + + if (Convert.ToInt32(ServiceCostRulesPrice) < MinPrice) + { + MinPrice = Convert.ToInt32(ServiceCostRulesPrice); + } } var ServiceTruckCostRulesPrice = db.Queryable().Where(x => saONSiteBaseInfo.Contains(x.QSID)).Min(x => x.Price); @@ -1815,10 +1741,6 @@ namespace EasyBL.WEBAPP.ShowEasy { MinPrice = ONSiteOtherCostRulesPrice; } - - - - } else { @@ -1877,15 +1799,10 @@ namespace EasyBL.WEBAPP.ShowEasy { var sServiceID = _fetchString(i_crm, @"ServiceID"); var iRel = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand(); - var iRel1 = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand(); - + var iRel1 = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand(); iRel1 = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand(); - iRel1 = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand(); - - iRel1 = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand(); - var saONSiteBaseInfo = db.Queryable().Where(x => x.ServiceID == sServiceID).Select(x => x.Guid).ToList(); if (saONSiteBaseInfo.Count > 0) { @@ -1896,7 +1813,6 @@ namespace EasyBL.WEBAPP.ShowEasy iRel1 = db.Deleteable().Where(x => x.QSID == ONSiteItemGuid).ExecuteCommand(); iRel1 = db.Deleteable().Where(x => x.QSID == ONSiteItemGuid).ExecuteCommand(); iRel1 = db.Deleteable().Where(x => x.ONSiteItemID == ONSiteItemGuid).ExecuteCommand(); - } } iRel1 = db.Deleteable().Where(x => x.ServiceID == sServiceID).ExecuteCommand();