wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-05-15 17:27:21 +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

5
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
View File

@@ -1081,12 +1081,13 @@ namespace CoreCms.Net.Web.Admin.Controllers
detailsStartNumber++;
}
//合并单元格（第几行，到第几行，第几列，到第几列）
var marId = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42 };
if (order.items.Count <= 1) continue;
foreach (var id in marId)
{
sheet1.AddMergedRegion(new CellRangeAddress(nowNumber + 1, detailsStartNumber, id, id));
}
}
// 写入到excel
@@ -1487,11 +1488,11 @@ namespace CoreCms.Net.Web.Admin.Controllers
}
//合并单元格（第几行，到第几行，第几列，到第几列）
var marId = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42 };
if (order.items.Count <= 1) continue;
foreach (var id in marId)
{
sheet1.AddMergedRegion(new CellRangeAddress(nowNumber + 1, detailsStartNumber, id, id));
}
}
// 写入到excel

12
CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs
View File

@@ -389,7 +389,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
rowTemp0.CellStyle = commonCellStyle;
var rowTemp1 = rowTemp.CreateCell(1);
rowTemp1.SetCellValue(listModel[i].serviceOrderId.ToString());
rowTemp1.SetCellValue(listModel[i].serviceOrderId);
rowTemp1.CellStyle = commonCellStyle;
var rowTemp2 = rowTemp.CreateCell(2);
@@ -409,7 +409,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
rowTemp5.CellStyle = commonCellStyle;
var rowTemp6 = rowTemp.CreateCell(6);
rowTemp6.SetCellValue(listModel[i].paymentId.ToString());
rowTemp6.SetCellValue(listModel[i].paymentId);
rowTemp6.CellStyle = commonCellStyle;
var rowTemp7 = rowTemp.CreateCell(7);
@@ -607,7 +607,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
var rowTemp1 = rowTemp.CreateCell(1);
rowTemp1.SetCellValue(listModel[i].serviceOrderId.ToString());
rowTemp1.SetCellValue(listModel[i].serviceOrderId);
rowTemp1.CellStyle = commonCellStyle;
@@ -637,7 +637,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
var rowTemp6 = rowTemp.CreateCell(6);
rowTemp6.SetCellValue(listModel[i].paymentId.ToString());
rowTemp6.SetCellValue(listModel[i].paymentId);
rowTemp6.CellStyle = commonCellStyle;
@@ -1042,7 +1042,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
rowTemp0.CellStyle = commonCellStyle;
var rowTemp1 = rowTemp.CreateCell(1);
rowTemp1.SetCellValue(listModel[i].serviceOrderId.ToString());
rowTemp1.SetCellValue(listModel[i].serviceOrderId);
rowTemp1.CellStyle = commonCellStyle;
var rowTemp2 = rowTemp.CreateCell(2);
@@ -1050,7 +1050,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
rowTemp2.CellStyle = commonCellStyle;
var rowTemp3 = rowTemp.CreateCell(3);
rowTemp3.SetCellValue(listModel[i].redeemCode.ToString());
rowTemp3.SetCellValue(listModel[i].redeemCode);
rowTemp3.CellStyle = commonCellStyle;
var rowTemp4 = rowTemp.CreateCell(4);