【修复】修复服务商品展示问题。

CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs

@@ -18,10 +18,10 @@ using CoreCms.Net.Configuration;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Filter;
 using CoreCms.Net.Loging;
 using CoreCms.Net.IServices;
+using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Helper;
 using CoreCms.Net.Utility.Extensions;
 using Microsoft.AspNetCore.Authorization;

CoreCms.Net.Web.Admin/Doc.xml

@@ -637,6 +637,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.GetGoodAndSku">
+            <summary>
+                获取商品列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.GetProducts(CoreCms.Net.Model.FromBody.FMIntId)">
             <summary>
                 根据商品序列获取货品数据
@@ -2931,7 +2937,7 @@
              服务购买表
             </summary>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsUserServicesOrderServices)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsUserServicesOrderServices,CoreCms.Net.IServices.ICoreCmsUserServicesTicketServices)">
              <summary>
              构造函数
             </summary>
@@ -2948,43 +2954,9 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.GetCreate">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoCancellation(CoreCms.Net.Model.FromBody.FMIntId)">
             <summary>
-            创建数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsUserServicesOrder)">
-            <summary>
-            创建提交
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
-            <summary>
-            编辑数据
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsUserServicesOrder)">
-            <summary>
-            编辑提交
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
-            <summary>
-            单选删除
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoBatchDelete(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
-            <summary>
-            批量删除
+            作废订单
             </summary>
             <param name="entity"></param>
             <returns></returns>
@@ -3016,176 +2988,36 @@
             <param name="entity"></param>
             <returns></returns>
         </member>
-        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController">
-             <summary>
-             服务消费券
-            </summary>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsUserServicesTicketServices)">
-             <summary>
-             构造函数
-            </summary>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.GetPageList">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.GetTicketPageList(System.String)">
             <summary>
-            获取列表
+            获取核销码列表
             </summary>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.GetIndex">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoCancellationTicket(CoreCms.Net.Model.FromBody.FMIntId)">
             <summary>
-            首页数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.GetCreate">
-            <summary>
-            创建数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsUserServicesTicket)">
-            <summary>
-            创建提交
+            作废核销码记录
             </summary>
             <param name="entity"></param>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.DoSetisVerification(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
             <summary>
-            编辑数据
+            设置核销码是否核销
             </summary>
             <param name="entity"></param>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsUserServicesTicket)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.SelectTicketExportExcel(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
             <summary>
-            编辑提交
+            选择核销码导出
             </summary>
             <param name="entity"></param>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesOrderController.QueryTicketExportExcel">
             <summary>
-            单选删除
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.DoBatchDelete(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
-            <summary>
-            批量删除
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
-            <summary>
-            预览数据
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.SelectExportExcel(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
-            <summary>
-            选择导出
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.QueryExportExcel">
-            <summary>
-            查询导出
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketController.DoSetisVerification(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
-            <summary>
-            设置是否核销
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController">
-             <summary>
-             服务券核验日志
-            </summary>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsUserServicesTicketVerificationLogServices)">
-             <summary>
-             构造函数
-            </summary>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.GetPageList">
-            <summary>
-            获取列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.GetIndex">
-            <summary>
-            首页数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.GetCreate">
-            <summary>
-            创建数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsUserServicesTicketVerificationLog)">
-            <summary>
-            创建提交
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
-            <summary>
-            编辑数据
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsUserServicesTicketVerificationLog)">
-            <summary>
-            编辑提交
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
-            <summary>
-            单选删除
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.DoBatchDelete(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
-            <summary>
-            批量删除
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
-            <summary>
-            预览数据
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.SelectExportExcel(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
-            <summary>
-            选择导出
-            </summary>
-            <param name="entity"></param>
-            <returns></returns>
-        </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserServicesTicketVerificationLogController.QueryExportExcel">
-            <summary>
-            查询导出
+            查询核销码导出
             </summary>
             <returns></returns>
         </member>
@@ -3839,6 +3671,166 @@
             <param name="entity"></param>
             <returns></returns>
         </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController">
+             <summary>
+             接龙活动表
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsSolitaireServices,CoreCms.Net.IServices.ICoreCmsSolitaireItemsServices)">
+             <summary>
+             构造函数
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.GetPageList">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.GetIndex">
+            <summary>
+            首页数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.GetCreate">
+            <summary>
+            创建数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsSolitaire)">
+            <summary>
+            创建提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            编辑数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsSolitaire)">
+            <summary>
+            编辑提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            单选删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.DoSetisShow(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
+            <summary>
+            设置是否显示
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireController.DoSetisDelete(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
+            <summary>
+            设置标注删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController">
+             <summary>
+             接龙活动商品表
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsSolitaireItemsServices)">
+             <summary>
+             构造函数
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.GetPageList">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.GetIndex">
+            <summary>
+            首页数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.GetCreate">
+            <summary>
+            创建数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsSolitaireItems)">
+            <summary>
+            创建提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            编辑数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsSolitaireItems)">
+            <summary>
+            编辑提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            单选删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.DoBatchDelete(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
+            <summary>
+            批量删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            预览数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.SelectExportExcel(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
+            <summary>
+            选择导出
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.QueryExportExcel">
+            <summary>
+            查询导出
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsSolitaireItemsController.DoSetisDelete(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
+            <summary>
+            设置标注删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsStockController">
              <summary>
              库存操作表