From 91bd54549686aaaadc60872e2b8a8eeffdbc8457 Mon Sep 17 00:00:00 2001 From: fzp <645608524@qq.com> Date: Fri, 22 Sep 2023 11:09:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/FinaChargeStuOrder/Index.js | 3 ++- .../Content/excel/线下缴费记录.xls | Bin 23552 -> 23552 bytes .../FinaChargeStuOrderEntity.cs | 5 +++++ .../FinaChargeStuOrderService.cs | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) 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 62e3aaa5a35e2dfc51f0b16d491b2494cf22eb09..244b98612ff266adf5bf04da64fb3d87952ecc92 100644 GIT binary patch delta 727 zcmZqJ!Pu~aaf2dry%G~+cXY77A%h6R9R>yl4u%PgK#HM_0`VjD29_VlEE)~Qo&Ik-4Ob3B1Fu@_tiB+75K^$y; zJ!VjIVYQe6XaRPI+F%uDWU$9-F$04gvii-ktS7Wo7wCh6n2jMgBQ>?eu$6(2VVe<> zh!IG{Z8DcZF#AmgcAy0NH delta 686 zcmZqJ!Pu~aaf2dry%rN=cXY77A%h6R9R>yl4u%PgK#HM_0`VjD29_VlEE)~Qo&Ik-4Ob3B1Fu@_tiB+75K^$y; zJ!VjIVYQe6XaRPI+F%uDWU$9-F$04gvii-ktS7WoTlGOf%*GI$k(yd!*vi1i&})Pw zVgwSAoy=tr%)Sq(3aD~&iowpw7KS}+wT27~vPP5dn9SLnW|YRr3zFqv5&&ris=8?$ z&w3rGBV)3+i3uMY13OTZ5y%I!*eCaz_%hDleA}d-kx_qhw%Jt1$qh!DlPq?!E<3pN T%#F?aEUc6m*KYn9#m)!-$DD>2 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) From 1d52dc96d8b83a5cb7f734899e622569119806fd Mon Sep 17 00:00:00 2001 From: fzp <645608524@qq.com> Date: Fri, 22 Sep 2023 18:24:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=A2=9E=E5=8A=A0=E5=AD=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FinaChargeStuYearController.cs | 2 +- .../Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 4110c015b..15f023e0e 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 @@ -252,7 +252,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.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";