From 23759995591791f5b2c1cae5444b791f76ad8a1f Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 15 Jul 2022 16:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E9=A3=9E=E6=89=AC=E7=89=88=E5=A4=96=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuInfoFreshController.cs | 14 ++++++++++++-- .../Views/StuInfoFresh/PayFeeForm.js | 2 +- .../Content/payxml/PayResultXMLFile.xml | 18 ++++++++++++++++++ .../Controllers/PayResultNoticeController.cs | 1 + .../Learun.Application.Web.csproj | 1 + .../Views/Home/AdminTop/Index.js | 15 +++++++++++---- 6 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Content/payxml/PayResultXMLFile.xml 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 8707ed481..422554349 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 @@ -1254,7 +1254,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers string payment = entity.PayMoney.ToString(); string curcode = "01"; string txcode = "530550"; - string remark1 = model.StuNo + "-20" + model.Grade; + string remark1 = model.StuNo; string remark2 = entity.PayFeeDetail.Replace("&", "-"); string returntype = "3"; string timeout = DateTime.Now.AddMinutes(10).ToString("yyyyMMddHHmmss"); @@ -1276,12 +1276,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } String url = bankURL + "&" + tmp1 + "&MAC=" + strMd5; string reJson = HttpMethods.Post(url); + LogEntity logEntity=new LogEntity(); + logEntity.F_CategoryId = 121; + logEntity.F_ExecuteResultJson = reJson; + logEntity.WriteLog(); //HttpConnect conn = new HttpConnect(); //string reJson = conn.Post(url, ""); JsonBean MemberInfoList = JsonConvert.DeserializeObject(reJson); if (MemberInfoList.SUCCESS.Equals("true")) { string imgCode = HttpMethods.Post(MemberInfoList.PAYURL); + logEntity.F_CategoryId = 121; + logEntity.F_ExecuteResultJson = imgCode; + logEntity.WriteLog(); MemberInfoList = JsonConvert.DeserializeObject(imgCode); if (MemberInfoList.SUCCESS.Equals("true")) { @@ -1384,7 +1391,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers bt = qrCodeEncoder.Encode(enCodeString, Encoding.UTF8); //二维码图片的名称 string filename = orderId; - + if (!Directory.Exists(Server.MapPath("~/Content/images/QRCode/"))) + { + Directory.CreateDirectory(Server.MapPath("~/Content/images/QRCode/")); + } var path = Server.MapPath("~/Content/images/QRCode/") + filename + ".jpg"; //保存二维码图片在photos路径下 try diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js index 38a108d1d..1e42674a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js @@ -121,7 +121,7 @@ var bootstrap = function ($, learun) { param.LoanMoney = $('#LoanMoney').val(); param.PayFeeDetail = detail; param.PayMoney = $('#PayMoney').html(); - + learun.loading(true); learun.httpAsyncPost(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/PayFeeQRCode?keyValue=' + keyValue, { strEntity: JSON.stringify(param), detailList: JSON.stringify(list) }, function (res) { learun.loading(false); //console.log(res); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/payxml/PayResultXMLFile.xml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/payxml/PayResultXMLFile.xml new file mode 100644 index 000000000..35956a2e6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/payxml/PayResultXMLFile.xml @@ -0,0 +1,18 @@ + + + 2020111112121212 + 105000082201406 + 002 + xcyz123456 + 5W1002 + CN + + 0 + + 1 + 1 + 0 + 043724806 + 3 + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/PayResultNoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/PayResultNoticeController.cs index cd7476e51..87495b1ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/PayResultNoticeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/PayResultNoticeController.cs @@ -14,6 +14,7 @@ namespace Learun.Application.Web.Controllers { //ccb Notice 建行支付通知 + [HttpPost] public ActionResult ccb() { //签名串 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 831a3380c..7c0cc745e 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 @@ -3271,6 +3271,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop/Index.js index 397e11700..b44801c17 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop/Index.js @@ -10,6 +10,7 @@ var z = A[B] || []; var o = a('
    '); for (var t = 0, w = z.length; t < w; t++) { + var u = z[t]; if (u.F_IsMenu == 1) { var n = a("
  • "); @@ -32,9 +33,15 @@ if (!!C.F_Description) { p.attr("title", C.F_Description) } - var D = ''; + + if (C.F_Target == 'open') { + var D = ''; + } else { + var D = ''; + } + D += ''; - D += '' + C.F_FullName + ""; + D += '' + C.F_FullName + "-----" + v + ""; D += ""; p.append(D); var K = A[C.F_ModuleId] || []; @@ -165,12 +172,12 @@ function () { a(this).prev().removeClass("open") }) - } else if (p.hasClass("lr-three-menu-list")){ + } else if (p.hasClass("lr-three-menu-list")) { p.parents(".lr-second-menu-list").find(".lr-three-menu-list").slideUp(300, function () { a(this).prev().removeClass("open") }) - }else{ + } else { p.parents(".lr-three-menu-list").find(".lr-four-menu-list").slideUp(300, function () { a(this).prev().removeClass("open")