@@ -37,6 +37,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); | private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); | ||||
private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); | private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); | ||||
private CdDeptIBLL cdDeptIBLL = new CdDeptBLL(); | private CdDeptIBLL cdDeptIBLL = new CdDeptBLL(); | ||||
#region 视图功能 | #region 视图功能 | ||||
@@ -185,6 +186,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
{ | { | ||||
return View(); | return View(); | ||||
} | } | ||||
[HttpGet] | |||||
public ActionResult InvoiceForm(string keyValue) | |||||
{ | |||||
var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue); | |||||
return Success(info); | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 助学贷款表单页 | /// 助学贷款表单页 | ||||
/// <summary> | /// <summary> | ||||
@@ -0,0 +1,18 @@ | |||||
@{ | |||||
ViewBag.Title = "新生缴费管理"; | |||||
Layout = "~/Views/Shared/_Form.cshtml"; | |||||
} | |||||
<style> | |||||
#btnBox { | |||||
text-align: center; | |||||
} | |||||
</style> | |||||
<div class="lr-form-wrap" id="form"> | |||||
<iframe src="http://192.168.53.135:5000/colleges-proxy/industryMain.do?method=displayH5&ciphertext=974221333dcef7ab255aff8db3ff317ae6296433fdf3025dcd6749ce97da76bf416307484f9e04961459e34839ea8e83f88a4fdd0c9679e7987fae94150bda44e297c1f5526ee56634f38759dac9e13a49442ce6c0e32aee2b6812e47e72a2ad5becfd00ae5d890f8d1dcbfd77996b97ee557ccce082cf5f60fb5a709ff1807265d45b9b0d0b2cf4a5e0b9b4313d715e93bc6862b1dba1f6fcef4485aa134c9df9ec6518d6489c8ed37730c46d906c597a036119b2f998f986eed5c7deffd0f603761f70c95c41072a53135812f6262631964de0033a5f56472770cdd60834cec8d97215e358763a28195cb0840ac355bc6ae4e1d9ad2ca03222cb28914725d8dca0855b4935e44109a4edf9790e7cef2c2914eb4c6762f50c7795d827ee4e5833806bc1ad70ba71ad9d9817d6c85029" width="100%" frameborder="0"> | |||||
</iframe> | |||||
<div id="btnBox"> | |||||
<div id="cancelPayFee" class="btn btn-default">取消</div> | |||||
</div> | |||||
</div> | |||||
@Html.AppendJsFile("/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(); | |||||
} |
@@ -26,6 +26,7 @@ | |||||
<a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> 查看</a> | <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> 查看</a> | ||||
@*<a id="lr_payFee" class="btn btn-default"><i class="fa fa-plus"></i> 缴费</a>*@ | @*<a id="lr_payFee" class="btn btn-default"><i class="fa fa-plus"></i> 缴费</a>*@ | ||||
<a id="lr_payCode" class="btn btn-default"><i class="fa fa-plus"></i> 二维码缴费</a> | <a id="lr_payCode" class="btn btn-default"><i class="fa fa-plus"></i> 二维码缴费</a> | ||||
<a id="lr_viewinvoice" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> 查看发票</a> | |||||
<a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i> 线上缴费</a> | <a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i> 线上缴费</a> | ||||
<a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i> 取消线上缴费</a> | <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i> 取消线上缴费</a> | ||||
@*<a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i> 填写贷款回执码</a>*@ | @*<a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i> 填写贷款回执码</a>*@ | ||||
@@ -63,27 +63,38 @@ var bootstrap = function ($, learun) { | |||||
var keyValue = $('#gridtable').jfGridValue('ID'); | var keyValue = $('#gridtable').jfGridValue('ID'); | ||||
selectedRow = $('#gridtable').jfGridGet('rowdata'); | selectedRow = $('#gridtable').jfGridGet('rowdata'); | ||||
if (learun.checkrow(keyValue)) { | 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 { | } else { | ||||
learun.alert.warning("当前新生尚未开具发票,请缴费成功后耐心等待!"); | |||||
learun.alert.warning("当前新生尚未缴费,请缴费成功后耐心等待!"); | |||||
return; | return; | ||||
} | } | ||||
} | } | ||||
}); | }); | ||||
// 缴费 | // 缴费 | ||||
$('#lr_payFee').on('click', function () { | $('#lr_payFee').on('click', function () { | ||||
var keyValue = $('#gridtable').jfGridValue('ID'); | var keyValue = $('#gridtable').jfGridValue('ID'); | ||||
selectedRow = $('#gridtable').jfGridGet('rowdata'); | selectedRow = $('#gridtable').jfGridGet('rowdata'); | ||||
if (selectedRow.PayFeeStatus == "1") { | |||||
learun.alert.warning("当前新生已线上缴费!"); | |||||
return; | |||||
} | |||||
if (learun.checkrow(keyValue)) { | if (learun.checkrow(keyValue)) { | ||||
learun.layerForm({ | learun.layerForm({ | ||||
id: 'form', | id: 'form', | ||||
@@ -245,14 +256,14 @@ var bootstrap = function ($, learun) { | |||||
//同步数据 | //同步数据 | ||||
$('#lr_synchronous').on('click', | $('#lr_synchronous').on('click', | ||||
function () { | 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(); | refreshGirdData(); | ||||
}); | |||||
} | |||||
}); | |||||
}); | |||||
} | |||||
}); | |||||
}); | }); | ||||
// 取消其他费用缴费 | // 取消其他费用缴费 | ||||
$('#lr_cancelOtherPay').on('click', function () { | $('#lr_cancelOtherPay').on('click', function () { | ||||
@@ -1098,6 +1098,7 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\MyClass.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\MyClass.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Print.css" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Print.css" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\InvoiceForm.js" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatusView.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatusView.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.js" /> | ||||
@@ -7726,6 +7727,7 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexItem.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexItem.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\FormOfElective.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\FormOfElective.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\IndexElective.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\IndexElective.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\InvoiceForm.cshtml" /> | |||||
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" /> | <None Include="Properties\PublishProfiles\CustomProfile.pubxml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | ||||
<Content Include="Views\Login\Default-beifen.cshtml" /> | <Content Include="Views\Login\Default-beifen.cshtml" /> | ||||
@@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// 开票状态 | /// 开票状态 | ||||
/// </summary> | /// </summary> | ||||
[Column("BILLSTATUS")] | [Column("BILLSTATUS")] | ||||
public bool billStatus { get; set; } | |||||
public bool? billStatus { get; set; } | |||||
/// <summary> | /// <summary> | ||||
/// 发票url地址 | /// 发票url地址 | ||||
/// </summary> | /// </summary> | ||||
@@ -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 | #endregion | ||||
} | } | ||||
} | } |
@@ -253,5 +253,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
(bool, string) IsPhoto(string stuId, bool status, string fileGuid); | (bool, string) IsPhoto(string stuId, bool status, string fileGuid); | ||||
#endregion | #endregion | ||||
StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue); | |||||
} | } | ||||
} | } |
@@ -1107,6 +1107,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
order.SJAmount = list.Sum(x => x.SJAmount); | order.SJAmount = list.Sum(x => x.SJAmount); | ||||
order.PlaceOrderTime = DateTime.Now; | order.PlaceOrderTime = DateTime.Now; | ||||
order.Status = 0; | order.Status = 0; | ||||
order.billStatus = false; | |||||
db.Insert(order); | db.Insert(order); | ||||
foreach (var detail in list) | 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 | #endregion | ||||
public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue) | |||||
{ | |||||
try | |||||
{ | |||||
int dateyear = DateTime.Now.Year; | |||||
var stufreshinfo = BaseRepository("CollegeMIS").FindEntity<StuInfoFreshEntity>(m=>m.ID==keyValue); | |||||
var model = BaseRepository("CollegeMIS").FindEntity<StuEnrollFeeOrderEntity>(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); | |||||
} | |||||
} | |||||
} | |||||
} | } | ||||
} | } |