Skip to content

T
Theater
Commit fac326fa authored by 吴春's avatar 吴春
Browse files
Options

剧院修改

parent d45dd4c4
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 63 deletions
EheMall.Business/Handlers/PhoneMsgHandler.cs
View file @ fac326fa
...@@ -173,22 +173,22 @@ namespace EheMall.Business.Handlers ...@@ -173,22 +173,22 @@ namespace EheMall.Business.Handlers
} }
else if (eventData.iType == 1003) else if (eventData.iType == 1003)
{ {
var model = userService.Get(eventData.UserID); //var model = userService.Get(eventData.UserID);
if (model == null) //if (model == null)
{ //{
bResult = false; // bResult = false;
eventData.bResult = bResult; // eventData.bResult = bResult;
eventData.sMessage = "手机号码不存在"; // eventData.sMessage = "手机号码不存在";
} //}
else { //else {
if (string.IsNullOrWhiteSpace(model.sPhone)) if (string.IsNullOrWhiteSpace(sPhone))
{ {
bResult = false; bResult = false;
eventData.bResult = bResult; eventData.bResult = bResult;
eventData.sMessage = "手机号码不存在"; eventData.sMessage = "手机号码不存在";
} }
} //}
TypeStr = "SMS_132045009"; TypeStr = "SMS_160490358";
} }
else if (eventData.iType == 1004) else if (eventData.iType == 1004)
{ {
...@@ -199,7 +199,7 @@ namespace EheMall.Business.Handlers ...@@ -199,7 +199,7 @@ namespace EheMall.Business.Handlers
eventData.bResult = bResult; eventData.bResult = bResult;
eventData.sMessage = "手机号码不存在"; eventData.sMessage = "手机号码不存在";
} }
TypeStr = "SMS_150170938"; TypeStr = "SMS_160480454";
} }
if (bResult) if (bResult)
{ {
...@@ -210,7 +210,8 @@ namespace EheMall.Business.Handlers ...@@ -210,7 +210,8 @@ namespace EheMall.Business.Handlers
{ {
Business.Services.SMSService.SendMsg(eventData.sPhone, eventData.sCode, TypeStr); Business.Services.SMSService.SendMsg(eventData.sPhone, eventData.sCode, TypeStr);
} }
else { else
{
Business.Services.SMSService.SendCode(eventData.sPhone, eventData.sCode, TypeStr); Business.Services.SMSService.SendCode(eventData.sPhone, eventData.sCode, TypeStr);
} }
......
EheMall.Business/Handlers/TheaterOrderHandler.cs
View file @ fac326fa
...@@ -65,7 +65,7 @@ namespace EheMall.Business.Handlers ...@@ -65,7 +65,7 @@ namespace EheMall.Business.Handlers
//RNGCryptoServiceProvider csp = new RNGCryptoServiceProvider(); //RNGCryptoServiceProvider csp = new RNGCryptoServiceProvider();
//byte[] byteCsp = new byte[2]; //byte[] byteCsp = new byte[2];
//csp.GetBytes(byteCsp); //csp.GetBytes(byteCsp);
entity.CollectingTickets = (DateTime.UtcNow - new DateTime(2019, 3, 1, 0, 0, 0, 0)).TotalMilliseconds.ToString("f0"); // GetWeekNow() +BitConverter.ToString(byteCsp).Replace("-", ""); entity.CollectingTickets = Guid.NewGuid().ToString().Substring(27, 8).ToUpper();//(DateTime.UtcNow - new DateTime(2019, 3, 1, 0, 0, 0, 0)).TotalMilliseconds.ToString("f0"); // GetWeekNow() +BitConverter.ToString(byteCsp).Replace("-", "");
entity.iBuyID = eventData.iLogUserId; entity.iBuyID = eventData.iLogUserId;
entity.iBuyCount = eventData.ParticularlyNum + eventData.FirstNum + eventData.ScondNum + eventData.ThirdNum; entity.iBuyCount = eventData.ParticularlyNum + eventData.FirstNum + eventData.ScondNum + eventData.ThirdNum;
entity.TotalPrice = eventData.TotalPrice; entity.TotalPrice = eventData.TotalPrice;
...@@ -84,7 +84,7 @@ namespace EheMall.Business.Handlers ...@@ -84,7 +84,7 @@ namespace EheMall.Business.Handlers
} }
var msg = new CheckCodeSendCommand() var msg = new CheckCodeSendCommand()
{ {
sCode = eventData.SucceedInfo + "下单成功，取票码：" + entity.CollectingTickets, sCode = $@"‘{ eventData.SucceedInfo + "下单成功，取票码：" + entity.CollectingTickets}'",
iType = 1004, iType = 1004,
sPhone = eventData.Mobile, sPhone = eventData.Mobile,
sKey = Helpers.PhoneMsgHelper.GenerateKey() sKey = Helpers.PhoneMsgHelper.GenerateKey()
......
EheMall.Business/Services/SMSService.cs
View file @ fac326fa
...@@ -33,7 +33,7 @@ namespace EheMall.Business.Services ...@@ -33,7 +33,7 @@ namespace EheMall.Business.Services
obj["cmd"] = "sms"; obj["cmd"] = "sms";
obj["phoneNumber"] = phoneNumber; obj["phoneNumber"] = phoneNumber;
obj["templateCode"] = templateCode; obj["templateCode"] = templateCode;
var TemplateParam = new { content }; var TemplateParam = new { code= content };
obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam); obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam);
QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj)); QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj));
} }
......
EheMall.Web/Areas/TicketMall/Controllers/HomeController.cs
View file @ fac326fa
...@@ -337,7 +337,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -337,7 +337,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
{ {
if (CurrentClient == null) if (CurrentClient == null)
{ {
return Redirect("/TicketMall/Login/Index"); return Json(new { valid = false, message = "登录信息过期，请重新登录" });
} }
if (Request.IsAjaxRequest()) if (Request.IsAjaxRequest())
{ {
...@@ -379,14 +379,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -379,14 +379,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
var msg = new CheckCodeSendCommand() var msg = new CheckCodeSendCommand()
{ {
UserID = theaterModel.iPrincipalID, UserID = theaterModel.iPrincipalID,
sCode = entity.SucceedInfo + "甲票已售罄", sCode = $@"‘{ entity.SucceedInfo + "甲票不足"}’",
iType = 1003, iType = 1003,
sPhone = theaterModel.sPhone, sPhone = theaterModel.sPhone,
sKey = Helpers.PhoneMsgHelper.GenerateKey() sKey = Helpers.PhoneMsgHelper.GenerateKey()
}; };
EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg); EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg);
} }
return Json(new { valid = false, message = "甲票已售罄" }); return Json(new { valid = false, message = "甲票不足" });
} }
entity.OrderDetail.FirstNum = entity.FirstNum; entity.OrderDetail.FirstNum = entity.FirstNum;
entity.OrderDetail.FirstPrice = modelPrice.FirstPrice; entity.OrderDetail.FirstPrice = modelPrice.FirstPrice;
...@@ -428,14 +428,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -428,14 +428,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
var msg = new CheckCodeSendCommand() var msg = new CheckCodeSendCommand()
{ {
UserID = theaterModel.iPrincipalID, UserID = theaterModel.iPrincipalID,
sCode = entity.SucceedInfo + "特票已售罄", sCode = $@"‘{ entity.SucceedInfo + "特票不足"}’",
iType = 1003, iType = 1003,
sPhone = theaterModel.sPhone, sPhone = theaterModel.sPhone,
sKey = Helpers.PhoneMsgHelper.GenerateKey() sKey = Helpers.PhoneMsgHelper.GenerateKey()
}; };
EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg); EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg);
} }
return Json(new { valid = false, message = "特票已售罄" }); return Json(new { valid = false, message = "特票不足" });
} }
entity.OrderDetail.ParticularlyNum = entity.ParticularlyNum; entity.OrderDetail.ParticularlyNum = entity.ParticularlyNum;
entity.OrderDetail.ParticularlyPrice = modelPrice.ParticularlyPrice; entity.OrderDetail.ParticularlyPrice = modelPrice.ParticularlyPrice;
...@@ -476,14 +476,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -476,14 +476,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
var msg = new CheckCodeSendCommand() var msg = new CheckCodeSendCommand()
{ {
UserID = theaterModel.iPrincipalID, UserID = theaterModel.iPrincipalID,
sCode = entity.SucceedInfo + "乙票已售罄", sCode = $@"‘{ entity.SucceedInfo + "乙票不足"}’",
iType = 1003, iType = 1003,
sPhone = theaterModel.sPhone, sPhone = theaterModel.sPhone,
sKey = Helpers.PhoneMsgHelper.GenerateKey() sKey = Helpers.PhoneMsgHelper.GenerateKey()
}; };
EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg); EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg);
} }
return Json(new { valid = false, message = "乙票已售罄" }); return Json(new { valid = false, message = "乙票不足" });
} }
entity.OrderDetail.ScondNum = entity.ScondNum; entity.OrderDetail.ScondNum = entity.ScondNum;
entity.OrderDetail.ScondPrice = modelPrice.ScondPrice; entity.OrderDetail.ScondPrice = modelPrice.ScondPrice;
...@@ -524,14 +524,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -524,14 +524,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
var msg = new CheckCodeSendCommand() var msg = new CheckCodeSendCommand()
{ {
UserID = theaterModel.iPrincipalID, UserID = theaterModel.iPrincipalID,
sCode = entity.SucceedInfo + "丙票已售罄", sCode = $@"‘{ entity.SucceedInfo + "丙票不足"}’",
iType = 1003, iType = 1003,
sPhone = theaterModel.sPhone, sPhone = theaterModel.sPhone,
sKey = Helpers.PhoneMsgHelper.GenerateKey() sKey = Helpers.PhoneMsgHelper.GenerateKey()
}; };
EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg); EngineContext.Current.ResolveOptional<Events.IEventBus>().Publish(msg);
} }
return Json(new { valid = false, message = "丙票已售罄" }); return Json(new { valid = false, message = "丙票不足" });
} }
entity.OrderDetail.ThirdNum = entity.ThirdNum; entity.OrderDetail.ThirdNum = entity.ThirdNum;
entity.OrderDetail.ThirdPrice = modelPrice.ThirdPrice; entity.OrderDetail.ThirdPrice = modelPrice.ThirdPrice;
...@@ -727,15 +727,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -727,15 +727,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
public ActionResult SendCode(int Type) public ActionResult SendCode(int Type)
{ {
//string code = CreateRandomCode(4);
//if (Type == 1)//修改手机号码
//{
// Session["UpdateMobileCode"] = code;
//}
//else
//{//修改密码
// Session["ModifyPWCode"] = code;
//}
//Member member = CurrentClient; //Member member = CurrentClient;
//Business.Services.SMSService.SendCode(member.MobilePhone, code, "SMS_132045009"); //Business.Services.SMSService.SendCode(member.MobilePhone, code, "SMS_132045009");
if (CurrentClient == null) if (CurrentClient == null)
...@@ -754,6 +746,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -754,6 +746,14 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
CodeType = 1001; CodeType = 1001;
} }
string sCode = StringExtensions.GenerateRandomDigitCode(5); string sCode = StringExtensions.GenerateRandomDigitCode(5);
if (Type == 1)//修改手机号码
{
Session["UpdateMobileCode"] = sCode;
}
else
{//修改密码
Session["ModifyPWCode"] = sCode;
}
result.RunWithTry(x => result.RunWithTry(x =>
{ {
var msg = new CheckCodeSendCommand() var msg = new CheckCodeSendCommand()
...@@ -788,15 +788,15 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -788,15 +788,15 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
{ {
return Json(new { valid = false, message = "请输入验证吗" }); return Json(new { valid = false, message = "请输入验证吗" });
} }
////验证code //验证code
//if (Session["ModifyPWCode"] == null) if (Session["ModifyPWCode"] == null)
//{ {
// return Json(new { valid = false, message = "验证码超时,请重新发送" }); return Json(new { valid = false, message = "验证码超时,请重新发送" });
//} }
//if (Session["ModifyPWCode"].ToString() != entity.SecurityCode) if (Session["ModifyPWCode"].ToString() != entity.SecurityCode)
//{ {
// return Json(new { valid = false, message = "验证码输入不正确" }); return Json(new { valid = false, message = "验证码输入不正确" });
//} }
if (string.IsNullOrWhiteSpace(entity.PassWord)) if (string.IsNullOrWhiteSpace(entity.PassWord))
{ {
...@@ -816,9 +816,10 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -816,9 +816,10 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
return Json(new { valid = false, message = "密码不能跟现在一样" }); return Json(new { valid = false, message = "密码不能跟现在一样" });
} }
entity.Type = 1002; entity.Type = 1002;
member.PassWord = entity.PassWord.Trim().MD5(); //member.PassWord = entity.PassWord.Trim().MD5();
this._eventBus.Publish(entity); this._eventBus.Publish(entity);
Session["Member"] = member; Session["Member"] = member;
Session["Member"] = null;
return Json(new { valid = true, message = "操作成功" }); return Json(new { valid = true, message = "操作成功" });
} }
catch (Exception ex) catch (Exception ex)
...@@ -850,10 +851,10 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -850,10 +851,10 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
{ {
return Json(new { valid = false, message = "验证码超时,请重新发送" }); return Json(new { valid = false, message = "验证码超时,请重新发送" });
} }
//if (Session["UpdateMobileCode"].ToString() != entity.SecurityCode) if (Session["UpdateMobileCode"].ToString() != entity.SecurityCode)
//{ {
// return Json(new { valid = false, message = "验证码输入不正确" }); return Json(new { valid = false, message = "验证码输入不正确" });
//} }
if (string.IsNullOrWhiteSpace(entity.MobilePhone)) if (string.IsNullOrWhiteSpace(entity.MobilePhone))
{ {
......
EheMall.Web/Areas/TicketMall/Controllers/LoginController.cs
View file @ fac326fa
...@@ -58,7 +58,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers ...@@ -58,7 +58,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
{ {
try try
{ {
EngineContext.Current.Resolve<IAuthenticate>().SignOut(); //EngineContext.Current.Resolve<IAuthenticate>().SignOut();
Session["Member"] = null; Session["Member"] = null;
return Json(new { valid = true, message = "退出成功" }); return Json(new { valid = true, message = "退出成功" });
} }
......
EheMall.Web/Areas/TicketMall/Views/Home/BuyTickets.cshtml
View file @ fac326fa
...@@ -211,8 +211,19 @@ ...@@ -211,8 +211,19 @@
}); });
} else { } else {
$(".Ticket_sureBtn").attr("onclick", "SaveOrder(this);"); $(".Ticket_sureBtn").attr("onclick", "SaveOrder(this);");
if (data.message == "登录信息过期，请重新登录") {
layer.msg(data.message, {
icon: 2,//提示的样式
end: function () {
location.href = "@Url.Action("Index", "Login")";
}
});
}
else {
layer.msg(data.message, { icon: 2 }); layer.msg(data.message, { icon: 2 });
} }
}
} }
}); });
......
EheMall.Web/Areas/TicketMall/Views/Home/MemberInfo.cshtml
View file @ fac326fa
...@@ -231,11 +231,11 @@ ...@@ -231,11 +231,11 @@
</div> </div>
<div class="buyTicket"> <div class="buyTicket">
<span class="Ticket_Total">新密码</span> <span class="Ticket_Total">新密码</span>
<input type="text" placeholder="密码为6-12位字母数字组成" class="ticket_input" name="PassWord" id="PassWord" /> <input type="password" placeholder="密码为6-12位字母数字组成" class="ticket_input" name="PassWord" id="PassWord" />
</div> </div>
<div class="buyTicket"> <div class="buyTicket">
<span class="Ticket_Total">再次输入密码</span> <span class="Ticket_Total">再次输入密码</span>
<input type="text" class="ticket_input" id="ValidataPW" /> <input type="password" class="ticket_input" id="ValidataPW" />
</div> </div>
<div> <div>
<input type="button" class="Ticket_sureBtn" value="确认" id="UpdatePW" /> <input type="button" class="Ticket_sureBtn" value="确认" id="UpdatePW" />
...@@ -341,10 +341,15 @@ ...@@ -341,10 +341,15 @@
data: { "SecurityCode": SecurityCode, "PassWord": PassWord}, data: { "SecurityCode": SecurityCode, "PassWord": PassWord},
success: function (data) { success: function (data) {
if (data.valid) { if (data.valid) {
layer.msg('修改成功', { icon: 1 }); layer.msg('修改成功', {
$("#SecurityCode").val(""); icon: 1,//提示的样式
$("#PassWord").val(""); end: function () {
$("#ValidataPW").val(""); location.href = "@Url.Action("Index","Login")";
}
});
//$("#SecurityCode").val("");
//$("#PassWord").val("");
//$("#ValidataPW").val("");
} else { } else {
layer.msg(data.message, { icon: 2 }); layer.msg(data.message, { icon: 2 });
//$("#SecurityCode").val(""); //$("#SecurityCode").val("");
...@@ -381,6 +386,8 @@ ...@@ -381,6 +386,8 @@
data: { "SecurityCode": MobileCode, "MobilePhone": MobilePhone}, data: { "SecurityCode": MobileCode, "MobilePhone": MobilePhone},
success: function (data) { success: function (data) {
if (data.valid) { if (data.valid) {
layer.msg('修改成功', { icon: 1 }); layer.msg('修改成功', { icon: 1 });
$("#MobileCode").val(""); $("#MobileCode").val("");
$("#MobilePhone").val(""); $("#MobilePhone").val("");
......
EheMall.Web/Web.config
View file @ fac326fa
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<authentication mode="Forms"> <authentication mode="Forms">
<forms cookieless="UseDeviceProfile" loginUrl="/Admin/Home/Login" defaultUrl="/Admin/Home" /> <forms cookieless="UseDeviceProfile" loginUrl="/Admin/Home/Login" defaultUrl="/Admin/Home" />
</authentication> </authentication>
<sessionState mode="InProc" cookieless="false" timeout="20" /> <sessionState mode="InProc" cookieless="false" timeout="30" />
<!--<sessionState mode="SQLServer" sqlCommandTimeout="120" sqlConnectionString="data source=.;User = sa; Password =123456" cookieless="false" timeout="120" />--> <!--<sessionState mode="SQLServer" sqlCommandTimeout="120" sqlConnectionString="data source=.;User = sa; Password =123456" cookieless="false" timeout="120" />-->
<customErrors mode="On" defaultRedirect="~/ErrorPage/404.htm"> <customErrors mode="On" defaultRedirect="~/ErrorPage/404.htm">
</customErrors> </customErrors>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment