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

CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs

@@ -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 + "元");

CoreCms.Net.Web.Admin/Doc.xml

@@ -4093,6 +4093,76 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController">
+             <summary>
+             版本更新表
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsAppUpdateLogServices)">
+             <summary>
+             构造函数
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.GetPageList">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.GetIndex">
+            <summary>
+            首页数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.GetCreate">
+            <summary>
+            创建数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsAppUpdateLog)">
+            <summary>
+            创建提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            编辑数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsAppUpdateLog)">
+            <summary>
+            编辑提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            单选删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            预览数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsAppUpdateLogController.DoSetisUpdate(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
+            <summary>
+            设置开启更新
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.Admin.Controllers.SysDictionaryController">
             <summary>
                 数据字典表
@@ -5065,6 +5135,19 @@
             <param name="entity"></param>
             <returns></returns>
         </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserController.GetEditParentId(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+                修改上级推荐人
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserController.DoEditParentId(CoreCms.Net.Model.FromBody.FMUpdateUserParentId)">
+            <summary>
+                修改上级推荐人提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserController.GetUserBalancePageList">
             <summary>
                 余额详情列表
@@ -5079,7 +5162,7 @@
         </member>
         <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserController.GetUserPointLogPageList">
             <summary>
-                获取列表
+                获取积分列表
             </summary>
             <returns></returns>
         </member>
@@ -5197,13 +5280,27 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserTocashController.SetStatus(CoreCms.Net.Model.FromBody.FMIntId)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserTocashController.GetTocash(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            提现处理
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserTocashController.SetStatus(CoreCms.Net.Model.FromBody.FMUserTocash)">
             <summary>
                 设置状态
             </summary>
             <param name="entity"></param>
             <returns></returns>
         </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserTocashController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            预览数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserTocashController.SelectExportExcel(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
             <summary>
                 选择导出
@@ -5332,6 +5429,30 @@
             <param name="entity"></param>
             <returns></returns>
         </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.WeChat.WeChatTransactionComponentAccountController">
+             <summary>
+             自定义交易组件上传类目资质
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChat.WeChatTransactionComponentAccountController.#ctor(CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory)">
+            <summary>
+            构造函数
+            </summary>
+            <param name="weChatApiHttpClientFactory"></param>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChat.WeChatTransactionComponentAccountController.GetInfo">
+            <summary>
+            获取商家信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChat.WeChatTransactionComponentAccountController.DoUpdateInfo(CoreCms.Net.WeChat.Service.TransactionComponent.FromBody.FMUpdateInfo)">
+            <summary>
+            更新商家信息
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentAuditCategoryController">
              <summary>
              自定义交易组件上传类目资质