Procházet zdrojové kódy

Merge branch '西昌缴费二期' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌缴费二期

西昌缴费二期
liangkun před 11 měsíci
rodič
revize
1d28788891
6 změnil soubory, kde provedl 10 přidání a 3 odebrání
  1. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs
  2. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js
  3. binární
      Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/线下缴费记录.xls
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs
  5. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderEntity.cs
  6. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs Zobrazit soubor

@@ -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";


+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js Zobrazit soubor

@@ -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,


binární
Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/线下缴费记录.xls Zobrazit soubor


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs Zobrazit soubor

@@ -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";


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderEntity.cs Zobrazit soubor

@@ -89,6 +89,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
/// </summary>
[Column("BANKORDER")]
public string BankOrder { get; set; }
/// <summary>
/// 备注
/// </summary>
[Column("ORDERREMARK")]
public string OrderRemark { get; set; }
#endregion

#region 扩展操作


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrder/FinaChargeStuOrderService.cs Zobrazit soubor

@@ -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)


Načítá se…
Zrušit
Uložit