wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 19:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【升级】升级Asp.Net 6.0.11 到 Asp.Net 7.0.0

Browse Source 
【升级】升级所有组建包，移除一些不用或者版本弃用的组建。
【优化】优化升级npoi最新版后，出现导出数据兼容性的问题。
【优化】使用新的【NLog.Database】nlog数据库链接组件,解决nlog升级到5.x以后版本记录到数据库日志失败的问题。
This commit is contained in:
大灰灰
2022-11-09 19:06:05 +08:00
parent 543bb281f4
commit 2313bf6ac9
58 changed files with 154 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs
View File

@@ -132,7 +132,7 @@ namespace CoreCms.Net.Services
p.status == (int)GlobalEnumVars.OrderStatus.Normal);
if (orderModel != null)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = orderId,
money = orderModel.orderAmount
@@ -162,7 +162,7 @@ namespace CoreCms.Net.Services
jm.msg = "请输入正确的充值金额";
return jm;
}
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = orderId,
money = dto.money
@@ -186,7 +186,7 @@ namespace CoreCms.Net.Services
var formInfo = await _formSubmitServices.QueryByClauseAsync(p => p.id == intId && p.payStatus == false);
if (formInfo != null)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = intId.ToString(),
money = formInfo.money
@@ -218,7 +218,7 @@ namespace CoreCms.Net.Services
var serviceInfo = await _servicesServices.QueryByClauseAsync(@where);
if (serviceInfo != null)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = orderId,
money = serviceInfo.money
@@ -290,7 +290,7 @@ namespace CoreCms.Net.Services
p.status == (int)GlobalEnumVars.OrderStatus.Normal);
if (orderModel != null)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = item,
money = orderModel.orderAmount
@@ -322,7 +322,7 @@ namespace CoreCms.Net.Services
}
foreach (var item in sourceStr)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = item,
money = dto.money
@@ -342,7 +342,7 @@ namespace CoreCms.Net.Services
var formInfo = await _formSubmitServices.QueryByClauseAsync(p => p.id == item && p.payStatus == false);
if (formInfo != null)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = item.ToString(),
money = formInfo.money
@@ -379,7 +379,7 @@ namespace CoreCms.Net.Services
var serviceInfo = await _servicesServices.QueryByClauseAsync(@where);
if (serviceInfo != null)
{
dto.rel.Add(new rel()
dto.rel.Add(new Rel()
{
sourceId = item,
money = serviceInfo.money