diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs index cf348c360..b0a83d05a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs @@ -264,7 +264,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers string merchantid = "105000082201406";//商户号 string posid = "043724806";//商户柜台代码 string branchid = "510000000";//分行代码 - string orderid = DateTime.Now.ToString("yyyyMMddhhmmss") + ran.Next(0, 100000); + string orderid = DateTime.Now.ToString("yyyyMMddhhmmss") + ran.Next(0, 10000000)+ entity.StuNo; string payment = entity.PayMoney.ToString(); string curcode = "01"; string txcode = "530550"; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js index 1bbdb8193..5a5fecade 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js @@ -177,7 +177,8 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "银行订单号", name: "BankOrder", width: 100, align: "left"}, + { label: "银行订单号", name: "BankOrder", width: 100, align: "left" }, + { label: "备注", name: "OrderRemark", width: 150, align: "left" } ], mainId:'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/线下缴费记录.xls b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/线下缴费记录.xls index 62e3aaa5a..244b98612 100644 Binary files a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/线下缴费记录.xls and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/线下缴费记录.xls differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs index 28c0596ee..0986830cd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs @@ -110,7 +110,7 @@ namespace Learun.Application.WebApi.Modules string merchantid = "105000082201406";//商户号 string posid = "043724806";//商户柜台代码 string branchid = "510000000";//分行代码 - string orderid = DateTime.Now.ToString("yyyyMMddhhmmss") + ran.Next(0, 100000); + string orderid = DateTime.Now.ToString("yyyyMMddhhmmss") + ran.Next(0, 10000000) + entity.StuNo; string payment = entity.PayMoney.ToString(); string curcode = "01"; string txcode = "530550"; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderEntity.cs index bf617c008..ae3e2f3bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderEntity.cs @@ -89,6 +89,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// [Column("BANKORDER")] public string BankOrder { get; set; } + /// + /// 备注 + /// + [Column("ORDERREMARK")] + public string OrderRemark { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs index 247655105..8231ab41c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs @@ -341,6 +341,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement orderEntity.Status = 1; orderEntity.OrderType = 2; orderEntity.BankOrder = dr[5].ToString(); + orderEntity.OrderRemark = dr[6].ToString(); //历史固定项目未缴费和部分缴费的数据 var oldnotpaylist = finaChargeStuYearItemList.Where(m => m.PayFeeStatus != 1).OrderBy(m => m.priority).ToList(); if (oldnotpaylist.Count==0)