diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index a5d0d3cb2..5ec972add 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -398,18 +398,18 @@ namespace Learun.Application.Web.Controllers ViewBag.FlowList = JsonConvert.SerializeObject(flowList); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; - var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); - if (stuSaveRecordList.Any()) - { - ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; - } + //var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + //if (stuSaveRecordList.Any()) + //{ + // ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + //} //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; - var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); - if (stuConsumptionList.Any()) - { - ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); - } + //var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + //if (stuConsumptionList.Any()) + //{ + // ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + //} //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() @@ -1401,18 +1401,19 @@ namespace Learun.Application.Web.Controllers ViewBag.FlowList = JsonConvert.SerializeObject(flowList); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; - var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); - if (stuSaveRecordList.Any()) - { - ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; - } + + //var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + //if (stuSaveRecordList.Any()) + //{ + // ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + //} //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; - var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); - if (stuConsumptionList.Any()) - { - ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); - } + //var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + //if (stuConsumptionList.Any()) + //{ + // ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + //} //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() @@ -1734,18 +1735,18 @@ namespace Learun.Application.Web.Controllers ViewBag.FlowList = JsonConvert.SerializeObject(flowList); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; - var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); - if (stuSaveRecordList.Any()) - { - ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; - } + //var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + //if (stuSaveRecordList.Any()) + //{ + // ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + //} //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; - var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); - if (stuConsumptionList.Any()) - { - ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); - } + //var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + //if (stuConsumptionList.Any()) + //{ + // ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + //} //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() @@ -2020,5 +2021,42 @@ namespace Learun.Application.Web.Controllers return Success("操作成功"); } + [HandlerLogin(FilterMode.Enforce)] + public ActionResult GetYKTPayed() + { + var yktpayed=cdMajorIBLL.GetYKTPayed(LoginUserInfo.Get().account); + if (yktpayed!=null&& yktpayed.Rows.Count>0) + { + return Success(new + { + YKTPayed = (yktpayed.Rows[0][0].ToDecimal()/100).ToDecimal(2) + }); + } + else + { + return Success(new { + YKTPayed=0 + }); + } + } + [HandlerLogin(FilterMode.Enforce)] + public ActionResult GetYKTBalance() + { + var yktpayed = cdMajorIBLL.GetYKTBalance(LoginUserInfo.Get().account); + if (yktpayed != null && yktpayed.Rows.Count > 0) + { + return Success(new + { + YKTPayed = (yktpayed.Rows[0][0].ToDecimal()/100).ToDecimal(2) + }); + } + else + { + return Success(new + { + YKTPayed = 0 + }); + } + } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml index 3d97972c1..5108768ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml @@ -20,71 +20,71 @@ //数据看板 var card1Fun = function (ind) { var html = '