wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-23 12:07:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

【新增】订单导出excel数据增加商品名称+货品sku组合展示的方式。

Browse Source
This commit is contained in:
大灰灰
2022-09-12 18:32:57 +08:00
parent d62d5f5bb6
commit 3b81d89959
2 changed files with 135 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
private readonly IWeChatTransactionComponentDeliveryCompanyServices _tcDeliveryCompanyServices;
private readonly IRedisOperationRepository _redisOperationRepository;
private readonly Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
private readonly CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
private readonly ICoreCmsOrderItemServices _orderItemServices;
@@ -300,6 +300,15 @@ namespace CoreCms.Net.Web.Admin.Controllers
jm.data = list;
jm.code = 0;
jm.count = list.TotalCount;
jm.otherData = new
{
list.HasNextPage,
list.HasPreviousPage,
list.PageIndex,
list.PageSize,
list.TotalCount,
list.TotalPages
};
jm.msg = "数据调用成功!";
return jm;
}
@@ -1021,7 +1030,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
rowTemp.CreateCell(10).SetCellValue(order.paymentTime.ToString());
rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? "【" + t.goodsId + "】" + t.addon : "【" + t.goodsId + "】" + t.name);
rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? t.name + "【" + t.goodsId + "】规格：" + t.addon : "【" + t.goodsId + "】" + t.name);
rowTemp.CreateCell(12).SetCellValue(t.nums);
rowTemp.CreateCell(13).SetCellValue(t.price + "元");
rowTemp.CreateCell(14).SetCellValue(t.promotionAmount + "元");
@@ -1426,7 +1435,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
rowTemp.CreateCell(10).SetCellValue(order.paymentTime.ToString());
rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? "【" + t.goodsId + "】" + t.addon : "【" + t.goodsId + "】" + t.name);
rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? t.name + "【" + t.goodsId + "】规格：" + t.addon : "【" + t.goodsId + "】" + t.name);
rowTemp.CreateCell(12).SetCellValue(t.nums);
rowTemp.CreateCell(13).SetCellValue(t.price + "元");
rowTemp.CreateCell(14).SetCellValue(t.promotionAmount + "元");