diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index e3a404171..8168345e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -37,6 +37,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); private CdDeptIBLL cdDeptIBLL = new CdDeptBLL(); + #region 视图功能 @@ -185,6 +186,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + [HttpGet] + public ActionResult InvoiceForm(string keyValue) + { + var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue); + return Success(info); + } /// /// 助学贷款表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml new file mode 100644 index 000000000..245d01d23 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml @@ -0,0 +1,18 @@ +@{ + ViewBag.Title = "新生缴费管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
+ +
+
取消
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js new file mode 100644 index 000000000..6670b48cd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js @@ -0,0 +1,33 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-08-08 17:21 + * 描 述：新生缴费管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + + //取消缴费 + $('#cancelPayFee').click(function () { + learun.layerClose(window.name); + }); + }, + initData: function () { + if (!!keyValue) { + + } + } + }; + + + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml index fae9ce86b..3a6566197 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml @@ -26,6 +26,7 @@  查看 @* 缴费*@  二维码缴费 +  查看发票  线上缴费  取消线上缴费 @* 填写贷款回执码*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 56a27c546..738c782cd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -63,27 +63,38 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.billStatus === true) { - learun.layerForm({ - id: 'form_payCode', - title: '二维码缴费', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/PayFeeForm?keyValue=' + keyValue, - width: 800, - height: 600, - btn: null - }); - + if (selectedRow.PayFeeStatus == "1") { + //查询发票链接 + learun.httpAsyncGet( + top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, function (res) { + if (!!res.data && !!res.data.billUrl) { + learun.layerForm({ + id: 'form_invoice', + title: '查看发票', + url: res.data.billUrl, + width: 1000, + height: 600, + btn: null + }); + } else { + learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + return; + } + }); } else { - learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + learun.alert.warning("当前新生尚未缴费，请缴费成功后耐心等待！"); return; } - } }); // 缴费 $('#lr_payFee').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (selectedRow.PayFeeStatus == "1") { + learun.alert.warning("当前新生已线上缴费！"); + return; + } if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'form', @@ -245,14 +256,14 @@ var bootstrap = function ($, learun) { //同步数据 $('#lr_synchronous').on('click', function () { - learun.layerConfirm('是否要同步缴费数据！',function (res) { - if (res) { - learun.postForm( - top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () { + learun.layerConfirm('是否要同步缴费数据！', function (res) { + if (res) { + learun.postForm( + top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () { refreshGirdData(); - }); - } - }); + }); + } + }); }); // 取消其他费用缴费 $('#lr_cancelOtherPay').on('click', function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 7c0cc745e..424391f59 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1098,6 +1098,7 @@ + @@ -7726,6 +7727,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollFeeOrder/StuEnrollFeeOrderEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollFeeOrder/StuEnrollFeeOrderEntity.cs index 24fea2208..14f3be839 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollFeeOrder/StuEnrollFeeOrderEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollFeeOrder/StuEnrollFeeOrderEntity.cs @@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 开票状态 /// [Column("BILLSTATUS")] - public bool billStatus { get; set; } + public bool? billStatus { get; set; } /// /// 发票url地址 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs index 6ce5593dd..b046e493d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs @@ -993,6 +993,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue) + { + try + { + return stuInfoFreshService.GetStuEnrollFeeOrder(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs index accc856d0..e80467c9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs @@ -253,5 +253,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration (bool, string) IsPhoto(string stuId, bool status, string fileGuid); #endregion + + StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 9986d6643..884da2072 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -1107,6 +1107,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration order.SJAmount = list.Sum(x => x.SJAmount); order.PlaceOrderTime = DateTime.Now; order.Status = 0; + order.billStatus = false; db.Insert(order); foreach (var detail in list) { @@ -2039,5 +2040,34 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo } #endregion + + public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue) + { + try + { + int dateyear = DateTime.Now.Year; + var stufreshinfo = BaseRepository("CollegeMIS").FindEntity(m=>m.ID==keyValue); + var model = BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == stufreshinfo.StuNo&&a.Status==1&&a.billStatus==true&&!string.IsNullOrEmpty(a.billUrl)&&a.YearNo== dateyear); + if (model != null) + { + return model; + } + else + { + return null; + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } }