From a6a156f4be76c1ed11e766fd6fdbab3d0c077564 Mon Sep 17 00:00:00 2001 From: zpc Date: Thu, 29 Aug 2024 13:19:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../M_MusicGenress/M_MusicGenresService.ts | 74 ++++ .../apps/T_OrderItemss/T_OrderItemsService.ts | 74 ++++ .../services/apps/T_Orders/T_OrderService.ts | 74 ++++ .../T_User_IntentOrderService.ts | 74 ++++ .../src/views/apps/M_MusicGenress/Index.vue | 232 ++++++++++++ .../src/views/apps/M_MusicGenress/Info.vue | 102 +++++ .../src/views/apps/T_OrderItemss/Index.vue | 232 ++++++++++++ .../src/views/apps/T_OrderItemss/Info.vue | 117 ++++++ .../src/views/apps/T_Orders/Index.vue | 232 ++++++++++++ admin-client/src/views/apps/T_Orders/Info.vue | 137 +++++++ .../views/apps/T_User_IntentOrders/Index.vue | 232 ++++++++++++ .../views/apps/T_User_IntentOrders/Info.vue | 137 +++++++ .../Apps/MiaoYuChat/M_MusicGenresService.cs | 109 ++++++ .../Apps/MiaoYuChat/T_OrderItemsService.cs | 109 ++++++ .../Apps/MiaoYuChat/T_OrderService.cs | 109 ++++++ .../MiaoYuChat/T_User_IntentOrderService.cs | 109 ++++++ .../LowCode/Impl/CodeGenerationService.cs | 2 +- .../LowCode/Impl/LowCodeTableInfoService.cs | 14 +- .../MiaoYuChat/M_MusicGenresController.cs | 100 +++++ .../Apps/MiaoYuChat/T_OrderController.cs | 100 +++++ .../Apps/MiaoYuChat/T_OrderItemsController.cs | 100 +++++ .../T_User_IntentOrderController.cs | 100 +++++ .../MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml | 348 ++++++++++++++++++ .../appsettings.Development.json | 2 +- .../templatev4/tempModel.cshtml | 1 + .../ChatAdminDbContext.cs | 68 +++- .../Entities/Apps/M_MusicGenres.cs | 36 ++ .../Entities/Apps/T_Order.cs | 77 ++++ .../Entities/Apps/T_OrderItems.cs | 54 +++ .../Entities/Apps/T_User_IntentOrder.cs | 78 ++++ .../MiaoYu.Repository.ChatAI.Admin.xml | 185 ++++++++++ 31 files changed, 3411 insertions(+), 7 deletions(-) create mode 100644 admin-client/src/services/apps/M_MusicGenress/M_MusicGenresService.ts create mode 100644 admin-client/src/services/apps/T_OrderItemss/T_OrderItemsService.ts create mode 100644 admin-client/src/services/apps/T_Orders/T_OrderService.ts create mode 100644 admin-client/src/services/apps/T_User_IntentOrders/T_User_IntentOrderService.ts create mode 100644 admin-client/src/views/apps/M_MusicGenress/Index.vue create mode 100644 admin-client/src/views/apps/M_MusicGenress/Info.vue create mode 100644 admin-client/src/views/apps/T_OrderItemss/Index.vue create mode 100644 admin-client/src/views/apps/T_OrderItemss/Info.vue create mode 100644 admin-client/src/views/apps/T_Orders/Index.vue create mode 100644 admin-client/src/views/apps/T_Orders/Info.vue create mode 100644 admin-client/src/views/apps/T_User_IntentOrders/Index.vue create mode 100644 admin-client/src/views/apps/T_User_IntentOrders/Info.vue create mode 100644 admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/M_MusicGenresService.cs create mode 100644 admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderItemsService.cs create mode 100644 admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderService.cs create mode 100644 admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_User_IntentOrderService.cs create mode 100644 admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/M_MusicGenresController.cs create mode 100644 admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderController.cs create mode 100644 admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderItemsController.cs create mode 100644 admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_User_IntentOrderController.cs create mode 100644 admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/M_MusicGenres.cs create mode 100644 admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Order.cs create mode 100644 admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_OrderItems.cs create mode 100644 admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_User_IntentOrder.cs diff --git a/admin-client/src/services/apps/M_MusicGenress/M_MusicGenresService.ts b/admin-client/src/services/apps/M_MusicGenress/M_MusicGenresService.ts new file mode 100644 index 0000000..0d96667 --- /dev/null +++ b/admin-client/src/services/apps/M_MusicGenress/M_MusicGenresService.ts @@ -0,0 +1,74 @@ +import Http from "@/core/utils/Http"; + +/** + * M_MusicGenres服务 + */ +export default class M_MusicGenresService { + + static urlPrefix = "/api/v1/admin/M_MusicGenres"; + + /** + * 获取数据列表 + * @param current + * @param pageSize + * @param search + * @param searchSort + * @returns + */ + static findList(current: number, pageSize: number, search: any = {}, searchSort: any[] = []) { + return Http.post(`${this.urlPrefix}/findList`, { + page: current, + size: pageSize, + search, + searchSort + }) + } + + /** + * 删除集合数据 + * + * @param ids + * @returns + */ + static deleteList(ids: string[]) { + return Http.post(`${this.urlPrefix}/deleteList`, ids) + } + + /** + * 查询表单 + * + * @param id + * @returns + */ + static findForm(id?: string | undefined) { + return Http.get(`${this.urlPrefix}/findForm${(id ? '/' + id : '')}`) + } + + /** + * 保存表单数据 + * + * @param id + * @param formData + * @returns + */ + static saveForm(id: string | undefined, formData: any) { + return Http.post(`${this.urlPrefix}/${id ? 'update' : 'create'}`, formData) + } + + /** + * 导出 excel + * + * @param search + * @param searchSort + * @returns + */ + static exportExcel(search: any = {}, searchSort: any[] = []) { + return Http.download(`${this.urlPrefix}/exportExcel`, { + page: -1, + size: -1, + search, + searchSort + }); + } + +} \ No newline at end of file diff --git a/admin-client/src/services/apps/T_OrderItemss/T_OrderItemsService.ts b/admin-client/src/services/apps/T_OrderItemss/T_OrderItemsService.ts new file mode 100644 index 0000000..2862409 --- /dev/null +++ b/admin-client/src/services/apps/T_OrderItemss/T_OrderItemsService.ts @@ -0,0 +1,74 @@ +import Http from "@/core/utils/Http"; + +/** + * T_OrderItems服务 + */ +export default class T_OrderItemsService { + + static urlPrefix = "/api/v1/admin/T_OrderItems"; + + /** + * 获取数据列表 + * @param current + * @param pageSize + * @param search + * @param searchSort + * @returns + */ + static findList(current: number, pageSize: number, search: any = {}, searchSort: any[] = []) { + return Http.post(`${this.urlPrefix}/findList`, { + page: current, + size: pageSize, + search, + searchSort + }) + } + + /** + * 删除集合数据 + * + * @param ids + * @returns + */ + static deleteList(ids: string[]) { + return Http.post(`${this.urlPrefix}/deleteList`, ids) + } + + /** + * 查询表单 + * + * @param id + * @returns + */ + static findForm(id?: string | undefined) { + return Http.get(`${this.urlPrefix}/findForm${(id ? '/' + id : '')}`) + } + + /** + * 保存表单数据 + * + * @param id + * @param formData + * @returns + */ + static saveForm(id: string | undefined, formData: any) { + return Http.post(`${this.urlPrefix}/${id ? 'update' : 'create'}`, formData) + } + + /** + * 导出 excel + * + * @param search + * @param searchSort + * @returns + */ + static exportExcel(search: any = {}, searchSort: any[] = []) { + return Http.download(`${this.urlPrefix}/exportExcel`, { + page: -1, + size: -1, + search, + searchSort + }); + } + +} \ No newline at end of file diff --git a/admin-client/src/services/apps/T_Orders/T_OrderService.ts b/admin-client/src/services/apps/T_Orders/T_OrderService.ts new file mode 100644 index 0000000..a79e8f3 --- /dev/null +++ b/admin-client/src/services/apps/T_Orders/T_OrderService.ts @@ -0,0 +1,74 @@ +import Http from "@/core/utils/Http"; + +/** + * T_Order服务 + */ +export default class T_OrderService { + + static urlPrefix = "/api/v1/admin/T_Order"; + + /** + * 获取数据列表 + * @param current + * @param pageSize + * @param search + * @param searchSort + * @returns + */ + static findList(current: number, pageSize: number, search: any = {}, searchSort: any[] = []) { + return Http.post(`${this.urlPrefix}/findList`, { + page: current, + size: pageSize, + search, + searchSort + }) + } + + /** + * 删除集合数据 + * + * @param ids + * @returns + */ + static deleteList(ids: string[]) { + return Http.post(`${this.urlPrefix}/deleteList`, ids) + } + + /** + * 查询表单 + * + * @param id + * @returns + */ + static findForm(id?: string | undefined) { + return Http.get(`${this.urlPrefix}/findForm${(id ? '/' + id : '')}`) + } + + /** + * 保存表单数据 + * + * @param id + * @param formData + * @returns + */ + static saveForm(id: string | undefined, formData: any) { + return Http.post(`${this.urlPrefix}/${id ? 'update' : 'create'}`, formData) + } + + /** + * 导出 excel + * + * @param search + * @param searchSort + * @returns + */ + static exportExcel(search: any = {}, searchSort: any[] = []) { + return Http.download(`${this.urlPrefix}/exportExcel`, { + page: -1, + size: -1, + search, + searchSort + }); + } + +} \ No newline at end of file diff --git a/admin-client/src/services/apps/T_User_IntentOrders/T_User_IntentOrderService.ts b/admin-client/src/services/apps/T_User_IntentOrders/T_User_IntentOrderService.ts new file mode 100644 index 0000000..ebb90f0 --- /dev/null +++ b/admin-client/src/services/apps/T_User_IntentOrders/T_User_IntentOrderService.ts @@ -0,0 +1,74 @@ +import Http from "@/core/utils/Http"; + +/** + * T_User_IntentOrder服务 + */ +export default class T_User_IntentOrderService { + + static urlPrefix = "/api/v1/admin/T_User_IntentOrder"; + + /** + * 获取数据列表 + * @param current + * @param pageSize + * @param search + * @param searchSort + * @returns + */ + static findList(current: number, pageSize: number, search: any = {}, searchSort: any[] = []) { + return Http.post(`${this.urlPrefix}/findList`, { + page: current, + size: pageSize, + search, + searchSort + }) + } + + /** + * 删除集合数据 + * + * @param ids + * @returns + */ + static deleteList(ids: string[]) { + return Http.post(`${this.urlPrefix}/deleteList`, ids) + } + + /** + * 查询表单 + * + * @param id + * @returns + */ + static findForm(id?: string | undefined) { + return Http.get(`${this.urlPrefix}/findForm${(id ? '/' + id : '')}`) + } + + /** + * 保存表单数据 + * + * @param id + * @param formData + * @returns + */ + static saveForm(id: string | undefined, formData: any) { + return Http.post(`${this.urlPrefix}/${id ? 'update' : 'create'}`, formData) + } + + /** + * 导出 excel + * + * @param search + * @param searchSort + * @returns + */ + static exportExcel(search: any = {}, searchSort: any[] = []) { + return Http.download(`${this.urlPrefix}/exportExcel`, { + page: -1, + size: -1, + search, + searchSort + }); + } + +} \ No newline at end of file diff --git a/admin-client/src/views/apps/M_MusicGenress/Index.vue b/admin-client/src/views/apps/M_MusicGenress/Index.vue new file mode 100644 index 0000000..ff0bae1 --- /dev/null +++ b/admin-client/src/views/apps/M_MusicGenress/Index.vue @@ -0,0 +1,232 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/M_MusicGenress/Info.vue b/admin-client/src/views/apps/M_MusicGenress/Info.vue new file mode 100644 index 0000000..bcedd18 --- /dev/null +++ b/admin-client/src/views/apps/M_MusicGenress/Info.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/T_OrderItemss/Index.vue b/admin-client/src/views/apps/T_OrderItemss/Index.vue new file mode 100644 index 0000000..e9cac1e --- /dev/null +++ b/admin-client/src/views/apps/T_OrderItemss/Index.vue @@ -0,0 +1,232 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/T_OrderItemss/Info.vue b/admin-client/src/views/apps/T_OrderItemss/Info.vue new file mode 100644 index 0000000..76c775e --- /dev/null +++ b/admin-client/src/views/apps/T_OrderItemss/Info.vue @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/T_Orders/Index.vue b/admin-client/src/views/apps/T_Orders/Index.vue new file mode 100644 index 0000000..10afa3e --- /dev/null +++ b/admin-client/src/views/apps/T_Orders/Index.vue @@ -0,0 +1,232 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/T_Orders/Info.vue b/admin-client/src/views/apps/T_Orders/Info.vue new file mode 100644 index 0000000..17e2701 --- /dev/null +++ b/admin-client/src/views/apps/T_Orders/Info.vue @@ -0,0 +1,137 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/T_User_IntentOrders/Index.vue b/admin-client/src/views/apps/T_User_IntentOrders/Index.vue new file mode 100644 index 0000000..9da395c --- /dev/null +++ b/admin-client/src/views/apps/T_User_IntentOrders/Index.vue @@ -0,0 +1,232 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/T_User_IntentOrders/Info.vue b/admin-client/src/views/apps/T_User_IntentOrders/Info.vue new file mode 100644 index 0000000..22aaf14 --- /dev/null +++ b/admin-client/src/views/apps/T_User_IntentOrders/Info.vue @@ -0,0 +1,137 @@ + + + \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/M_MusicGenresService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/M_MusicGenresService.cs new file mode 100644 index 0000000..6f79fe9 --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/M_MusicGenresService.cs @@ -0,0 +1,109 @@ +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.ApplicationServices.Apps; + +/// +/// 存储不同音乐风格的信息。 服务 M_MusicGenresService +/// +public class M_MusicGenresService : ApplicationService> +{ + public M_MusicGenresService(IRepository defaultRepository) + : base(defaultRepository) + { + + } + + /// + /// 获取列表数据 + /// + /// + /// + public async Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this._defaultRepository.Select + + //项目 + .WhereIf(pagingSearchInput.Search?.TenantId!=null, + w => w.TenantId==pagingSearchInput.Search.TenantId) + + + + .OrderByDescending(w => w.Id) + .Select(w => new + { + w.Id, + w.GenreName,w.Description,w.TenantId,w.OrderId,w.IsEnabled, + // w.LastModificationTime, + // w.CreationTime + }) + ; + + var result = await _defaultRepository.AsPagingViewAsync(query, pagingSearchInput); + // result + // .FormatValue(query, w => w.CreationTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + // .FormatValue(query, w => w.LastModificationTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) + // ; + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w.OperatorName!).SetColumn(w => w.Name!); + + return result; + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + public async Task DeleteListAsync(List ids) + { + await this._defaultRepository.DeleteByIdsAsync(ids); + } + + /// + /// 查询表单数据 + /// + /// id + /// + public async Task> FindFormAsync(int id) + { + var res = new Dictionary(); + var form = await this._defaultRepository.FindByIdAsync(id); + form = form.NullSafe(); + //if (form.CreateTime == null || form.CreateTime == DateTime.MinValue) + //{ + // form.CreateTime = DateTime.Now; + //} + //if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue) + //{ + // form.UpdateTime = DateTime.Now; + //} + res[nameof(id)] = id; + res[nameof(form)] = form; + return res; + } + + /// + /// 保存数据 + /// + /// form + /// + public Task SaveFormAsync(M_MusicGenres form) + { + return this._defaultRepository.InsertOrUpdateAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + public async Task ExportExcelAsync(PagingSearchInput pagingSearchInput) + { + pagingSearchInput.Page = -1; + var tableViewModel = await this.FindListAsync(pagingSearchInput); + return ExcelUtil.ExportExcelByPagingView(tableViewModel, null, "Id"); + } + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderItemsService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderItemsService.cs new file mode 100644 index 0000000..f1e9fc4 --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderItemsService.cs @@ -0,0 +1,109 @@ +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.ApplicationServices.Apps; + +/// +/// 订单详情表 服务 T_OrderItemsService +/// +public class T_OrderItemsService : ApplicationService> +{ + public T_OrderItemsService(IRepository defaultRepository) + : base(defaultRepository) + { + + } + + /// + /// 获取列表数据 + /// + /// + /// + public async Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this._defaultRepository.Select + + //项目 + .WhereIf(pagingSearchInput.Search?.TenantId!=null, + w => w.TenantId==pagingSearchInput.Search.TenantId) + + + + .OrderByDescending(w => w.Id) + .Select(w => new + { + w.Id, + w.TenantId,w.ProductId,w.OrderId,w.RewardInfo,w.Product,w.PaymentInfo,w.RewardTips,w.PayUrl, + // w.LastModificationTime, + // w.CreationTime + }) + ; + + var result = await _defaultRepository.AsPagingViewAsync(query, pagingSearchInput); + // result + // .FormatValue(query, w => w.CreationTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + // .FormatValue(query, w => w.LastModificationTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) + // ; + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w.OperatorName!).SetColumn(w => w.Name!); + + return result; + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + public async Task DeleteListAsync(List ids) + { + await this._defaultRepository.DeleteByIdsAsync(ids); + } + + /// + /// 查询表单数据 + /// + /// id + /// + public async Task> FindFormAsync(int id) + { + var res = new Dictionary(); + var form = await this._defaultRepository.FindByIdAsync(id); + form = form.NullSafe(); + //if (form.CreateTime == null || form.CreateTime == DateTime.MinValue) + //{ + // form.CreateTime = DateTime.Now; + //} + //if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue) + //{ + // form.UpdateTime = DateTime.Now; + //} + res[nameof(id)] = id; + res[nameof(form)] = form; + return res; + } + + /// + /// 保存数据 + /// + /// form + /// + public Task SaveFormAsync(T_OrderItems form) + { + return this._defaultRepository.InsertOrUpdateAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + public async Task ExportExcelAsync(PagingSearchInput pagingSearchInput) + { + pagingSearchInput.Page = -1; + var tableViewModel = await this.FindListAsync(pagingSearchInput); + return ExcelUtil.ExportExcelByPagingView(tableViewModel, null, "Id"); + } + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderService.cs new file mode 100644 index 0000000..755588d --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_OrderService.cs @@ -0,0 +1,109 @@ +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.ApplicationServices.Apps; + +/// +/// 订单完成表 服务 T_OrderService +/// +public class T_OrderService : ApplicationService> +{ + public T_OrderService(IRepository defaultRepository) + : base(defaultRepository) + { + + } + + /// + /// 获取列表数据 + /// + /// + /// + public async Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this._defaultRepository.Select + + //项目 + .WhereIf(pagingSearchInput.Search?.TenantId!=null, + w => w.TenantId==pagingSearchInput.Search.TenantId) + + + + .OrderByDescending(w => w.Id) + .Select(w => new + { + w.Id, + w.TenantId,w.OrderId,w.UserId,w.OrderDate,w.PaymentDate,w.PaymentMethod,w.ProductId,w.TotalPrice,w.Status,w.CreatedAt,w.UpdatedAt,w.PaymentDay, + // w.LastModificationTime, + // w.CreationTime + }) + ; + + var result = await _defaultRepository.AsPagingViewAsync(query, pagingSearchInput); + // result + // .FormatValue(query, w => w.CreationTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + // .FormatValue(query, w => w.LastModificationTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) + // ; + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w.OperatorName!).SetColumn(w => w.Name!); + + return result; + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + public async Task DeleteListAsync(List ids) + { + await this._defaultRepository.DeleteByIdsAsync(ids); + } + + /// + /// 查询表单数据 + /// + /// id + /// + public async Task> FindFormAsync(int id) + { + var res = new Dictionary(); + var form = await this._defaultRepository.FindByIdAsync(id); + form = form.NullSafe(); + //if (form.CreateTime == null || form.CreateTime == DateTime.MinValue) + //{ + // form.CreateTime = DateTime.Now; + //} + //if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue) + //{ + // form.UpdateTime = DateTime.Now; + //} + res[nameof(id)] = id; + res[nameof(form)] = form; + return res; + } + + /// + /// 保存数据 + /// + /// form + /// + public Task SaveFormAsync(T_Order form) + { + return this._defaultRepository.InsertOrUpdateAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + public async Task ExportExcelAsync(PagingSearchInput pagingSearchInput) + { + pagingSearchInput.Page = -1; + var tableViewModel = await this.FindListAsync(pagingSearchInput); + return ExcelUtil.ExportExcelByPagingView(tableViewModel, null, "Id"); + } + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_User_IntentOrderService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_User_IntentOrderService.cs new file mode 100644 index 0000000..3f66388 --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_User_IntentOrderService.cs @@ -0,0 +1,109 @@ +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.ApplicationServices.Apps; + +/// +/// 意向订单表 服务 T_User_IntentOrderService +/// +public class T_User_IntentOrderService : ApplicationService> +{ + public T_User_IntentOrderService(IRepository defaultRepository) + : base(defaultRepository) + { + + } + + /// + /// 获取列表数据 + /// + /// + /// + public async Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this._defaultRepository.Select + + //项目 + .WhereIf(pagingSearchInput.Search?.TenantId!=null, + w => w.TenantId==pagingSearchInput.Search.TenantId) + + + + .OrderByDescending(w => w.Id) + .Select(w => new + { + w.Id, + w.UserId,w.ProductId,w.Method,w.Price,w.Quantity,w.Status,w.Notes,w.IntentDate,w.CreatedAt,w.UpdatedAt,w.TenantId,w.OrderId, + // w.LastModificationTime, + // w.CreationTime + }) + ; + + var result = await _defaultRepository.AsPagingViewAsync(query, pagingSearchInput); + // result + // .FormatValue(query, w => w.CreationTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + // .FormatValue(query, w => w.LastModificationTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) + // ; + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w.OperatorName!).SetColumn(w => w.Name!); + + return result; + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + public async Task DeleteListAsync(List ids) + { + await this._defaultRepository.DeleteByIdsAsync(ids); + } + + /// + /// 查询表单数据 + /// + /// id + /// + public async Task> FindFormAsync(int id) + { + var res = new Dictionary(); + var form = await this._defaultRepository.FindByIdAsync(id); + form = form.NullSafe(); + //if (form.CreateTime == null || form.CreateTime == DateTime.MinValue) + //{ + // form.CreateTime = DateTime.Now; + //} + //if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue) + //{ + // form.UpdateTime = DateTime.Now; + //} + res[nameof(id)] = id; + res[nameof(form)] = form; + return res; + } + + /// + /// 保存数据 + /// + /// form + /// + public Task SaveFormAsync(T_User_IntentOrder form) + { + return this._defaultRepository.InsertOrUpdateAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + public async Task ExportExcelAsync(PagingSearchInput pagingSearchInput) + { + pagingSearchInput.Page = -1; + var tableViewModel = await this.FindListAsync(pagingSearchInput); + return ExcelUtil.ExportExcelByPagingView(tableViewModel, null, "Id"); + } + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/CodeGenerationService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/CodeGenerationService.cs index 1dd0b80..dc9940f 100644 --- a/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/CodeGenerationService.cs +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/CodeGenerationService.cs @@ -521,7 +521,7 @@ public class CodeGenerationService : ICodeGenerationService private string FindCodeFileClassName(GenFormDto genFormDto) { var tableName = genFormDto.TableName.ToLineConvertHump(); - if (genFormDto.TableName.Contains("T_")) + if (genFormDto.TableName.Contains("T_")|| genFormDto.TableName.Contains("M_")) { tableName = genFormDto.TableName; } diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/LowCodeTableInfoService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/LowCodeTableInfoService.cs index fe7fbad..0e7e356 100644 --- a/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/LowCodeTableInfoService.cs +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/LowCodeTableInfoService.cs @@ -125,7 +125,7 @@ public class LowCodeTableInfoService : ApplicationService w.Low_Code_TableId == table.Id); + foreach (var item in tableInfo.Columns) { @@ -147,10 +147,20 @@ public class LowCodeTableInfoService : ApplicationService w.ColumnName == item.Name); + if (oldColumns!=null) + { + model.OrderById = oldColumns.OrderById; + model.Describe = oldColumns.Describe; + model.IsImageId = oldColumns.IsImageId; + model.IsTableColumnShow = oldColumns.IsTableColumnShow; + model.IsTableSelect = oldColumns.IsTableSelect; + model.Width = oldColumns.Width; + }; list.Add(model); } } - + await _defaultRepository.DeleteAsync(w => w.Low_Code_TableId == table.Id); await _defaultRepository.InsertRangeAsync(list); _databaseTableService.ClearAllTablesByCache(); diff --git a/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/M_MusicGenresController.cs b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/M_MusicGenresController.cs new file mode 100644 index 0000000..1ec577d --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/M_MusicGenresController.cs @@ -0,0 +1,100 @@ +using MiaoYu.Api.Admin.ApplicationServices.Apps; +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.Controllers.Apps; + +/// +/// 存储不同音乐风格的信息。 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "存储不同音乐风格的信息。")] +public class M_MusicGenresController : AdminControllerBase +{ + public M_MusicGenresController(M_MusicGenresService defaultService) + : base(defaultService) + { + + } + + /// + /// 获取列表 + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Display, DisplayName = "查看数据")] + [HttpPost] + public Task FindListAsync([FromBody] PagingSearchInput pagingSearchInput) + { + return this._defaultService.FindListAsync(pagingSearchInput); + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Delete, DisplayName = "删除数据")] + [HttpPost] + public async Task DeleteListAsync([FromBody] List ids) + { + await this._defaultService.DeleteListAsync(ids); + return true; + } + + /// + /// 查询表单数据 + /// + /// id + /// + [ActionDescriptor(DisplayName = "查看表单")] + [HttpGet("{id?}")] + public Task> FindFormAsync([FromRoute] int id) + { + return this._defaultService.FindFormAsync(id); + } + + /// + /// 添加 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Insert, DisplayName = "创建表单")] + [HttpPost] + [ApiCheckModel] + public Task CreateAsync([FromBody] M_MusicGenres form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 编辑 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Update, DisplayName = "编辑表单")] + [HttpPost] + [ApiCheckModel] + public Task UpdateAsync([FromBody] M_MusicGenres form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Export, DisplayName = "导出数据")] + [ApiResourceCacheFilter(10)] + [HttpPost] + public async Task ExportExcelAsync([FromBody] PagingSearchInput pagingSearchInput) + { + var data = await this._defaultService.ExportExcelAsync(pagingSearchInput); + var name = $"{PermissionUtil.GetControllerDisplayName(this.GetType())}列表数据 {DateTime.Now.ToString("yyyy-MM-dd")}.xls"; + base.HttpContext.DownLoadFile(data, Tools.GetFileContentType[".xls"].ToStr(), name); + } + + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderController.cs b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderController.cs new file mode 100644 index 0000000..e15ee2a --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderController.cs @@ -0,0 +1,100 @@ +using MiaoYu.Api.Admin.ApplicationServices.Apps; +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.Controllers.Apps; + +/// +/// 订单完成表 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "订单完成表")] +public class T_OrderController : AdminControllerBase +{ + public T_OrderController(T_OrderService defaultService) + : base(defaultService) + { + + } + + /// + /// 获取列表 + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Display, DisplayName = "查看数据")] + [HttpPost] + public Task FindListAsync([FromBody] PagingSearchInput pagingSearchInput) + { + return this._defaultService.FindListAsync(pagingSearchInput); + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Delete, DisplayName = "删除数据")] + [HttpPost] + public async Task DeleteListAsync([FromBody] List ids) + { + await this._defaultService.DeleteListAsync(ids); + return true; + } + + /// + /// 查询表单数据 + /// + /// id + /// + [ActionDescriptor(DisplayName = "查看表单")] + [HttpGet("{id?}")] + public Task> FindFormAsync([FromRoute] int id) + { + return this._defaultService.FindFormAsync(id); + } + + /// + /// 添加 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Insert, DisplayName = "创建表单")] + [HttpPost] + [ApiCheckModel] + public Task CreateAsync([FromBody] T_Order form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 编辑 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Update, DisplayName = "编辑表单")] + [HttpPost] + [ApiCheckModel] + public Task UpdateAsync([FromBody] T_Order form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Export, DisplayName = "导出数据")] + [ApiResourceCacheFilter(10)] + [HttpPost] + public async Task ExportExcelAsync([FromBody] PagingSearchInput pagingSearchInput) + { + var data = await this._defaultService.ExportExcelAsync(pagingSearchInput); + var name = $"{PermissionUtil.GetControllerDisplayName(this.GetType())}列表数据 {DateTime.Now.ToString("yyyy-MM-dd")}.xls"; + base.HttpContext.DownLoadFile(data, Tools.GetFileContentType[".xls"].ToStr(), name); + } + + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderItemsController.cs b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderItemsController.cs new file mode 100644 index 0000000..1c850de --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_OrderItemsController.cs @@ -0,0 +1,100 @@ +using MiaoYu.Api.Admin.ApplicationServices.Apps; +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.Controllers.Apps; + +/// +/// 订单详情表 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "订单详情表")] +public class T_OrderItemsController : AdminControllerBase +{ + public T_OrderItemsController(T_OrderItemsService defaultService) + : base(defaultService) + { + + } + + /// + /// 获取列表 + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Display, DisplayName = "查看数据")] + [HttpPost] + public Task FindListAsync([FromBody] PagingSearchInput pagingSearchInput) + { + return this._defaultService.FindListAsync(pagingSearchInput); + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Delete, DisplayName = "删除数据")] + [HttpPost] + public async Task DeleteListAsync([FromBody] List ids) + { + await this._defaultService.DeleteListAsync(ids); + return true; + } + + /// + /// 查询表单数据 + /// + /// id + /// + [ActionDescriptor(DisplayName = "查看表单")] + [HttpGet("{id?}")] + public Task> FindFormAsync([FromRoute] int id) + { + return this._defaultService.FindFormAsync(id); + } + + /// + /// 添加 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Insert, DisplayName = "创建表单")] + [HttpPost] + [ApiCheckModel] + public Task CreateAsync([FromBody] T_OrderItems form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 编辑 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Update, DisplayName = "编辑表单")] + [HttpPost] + [ApiCheckModel] + public Task UpdateAsync([FromBody] T_OrderItems form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Export, DisplayName = "导出数据")] + [ApiResourceCacheFilter(10)] + [HttpPost] + public async Task ExportExcelAsync([FromBody] PagingSearchInput pagingSearchInput) + { + var data = await this._defaultService.ExportExcelAsync(pagingSearchInput); + var name = $"{PermissionUtil.GetControllerDisplayName(this.GetType())}列表数据 {DateTime.Now.ToString("yyyy-MM-dd")}.xls"; + base.HttpContext.DownLoadFile(data, Tools.GetFileContentType[".xls"].ToStr(), name); + } + + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_User_IntentOrderController.cs b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_User_IntentOrderController.cs new file mode 100644 index 0000000..174ddac --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/MiaoYuChat/T_User_IntentOrderController.cs @@ -0,0 +1,100 @@ +using MiaoYu.Api.Admin.ApplicationServices.Apps; +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.Controllers.Apps; + +/// +/// 意向订单表 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "意向订单表")] +public class T_User_IntentOrderController : AdminControllerBase +{ + public T_User_IntentOrderController(T_User_IntentOrderService defaultService) + : base(defaultService) + { + + } + + /// + /// 获取列表 + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Display, DisplayName = "查看数据")] + [HttpPost] + public Task FindListAsync([FromBody] PagingSearchInput pagingSearchInput) + { + return this._defaultService.FindListAsync(pagingSearchInput); + } + + /// + /// 根据id数组删除 + /// + /// ids + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Delete, DisplayName = "删除数据")] + [HttpPost] + public async Task DeleteListAsync([FromBody] List ids) + { + await this._defaultService.DeleteListAsync(ids); + return true; + } + + /// + /// 查询表单数据 + /// + /// id + /// + [ActionDescriptor(DisplayName = "查看表单")] + [HttpGet("{id?}")] + public Task> FindFormAsync([FromRoute] int id) + { + return this._defaultService.FindFormAsync(id); + } + + /// + /// 添加 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Insert, DisplayName = "创建表单")] + [HttpPost] + [ApiCheckModel] + public Task CreateAsync([FromBody] T_User_IntentOrder form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 编辑 + /// + /// + /// + [RequestLimitFilter(Duration = 1, LimitCount = 1)] + [ActionDescriptor(PermissionFunctionConsts.Function_Update, DisplayName = "编辑表单")] + [HttpPost] + [ApiCheckModel] + public Task UpdateAsync([FromBody] T_User_IntentOrder form) + { + return this._defaultService.SaveFormAsync(form); + } + + /// + /// 导出Excel + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Export, DisplayName = "导出数据")] + [ApiResourceCacheFilter(10)] + [HttpPost] + public async Task ExportExcelAsync([FromBody] PagingSearchInput pagingSearchInput) + { + var data = await this._defaultService.ExportExcelAsync(pagingSearchInput); + var name = $"{PermissionUtil.GetControllerDisplayName(this.GetType())}列表数据 {DateTime.Now.ToString("yyyy-MM-dd")}.xls"; + base.HttpContext.DownLoadFile(data, Tools.GetFileContentType[".xls"].ToStr(), name); + } + + + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml index a721311..ab55298 100644 --- a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml +++ b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml @@ -129,6 +129,46 @@ + + + 存储不同音乐风格的信息。 服务 M_MusicGenresService + + + + + 获取列表数据 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 保存数据 + + form + + + + + 导出Excel + + + + 图片表 服务 TImageConfigService @@ -663,6 +703,86 @@ + + + 订单详情表 服务 T_OrderItemsService + + + + + 获取列表数据 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 保存数据 + + form + + + + + 导出Excel + + + + + + + 订单完成表 服务 T_OrderService + + + + + 获取列表数据 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 保存数据 + + form + + + + + 导出Excel + + + + 商城表 服务 T_ProductsService @@ -886,6 +1006,46 @@ + + + 意向订单表 服务 T_User_IntentOrderService + + + + + 获取列表数据 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 保存数据 + + form + + + + + 导出Excel + + + + 手机号登录表 服务 T_User_Phone_AccountService @@ -2156,6 +2316,53 @@ 默认服务 + + + 存储不同音乐风格的信息。 控制器 + + + + + 获取列表 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 添加 + + + + + + + 编辑 + + + + + + + 导出Excel + + + + 图片表 控制器 @@ -2759,6 +2966,100 @@ + + + 订单完成表 控制器 + + + + + 获取列表 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 添加 + + + + + + + 编辑 + + + + + + + 导出Excel + + + + + + + 订单详情表 控制器 + + + + + 获取列表 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 添加 + + + + + + + 编辑 + + + + + + + 导出Excel + + + + 商城表 控制器 @@ -3017,6 +3318,53 @@ + + + 意向订单表 控制器 + + + + + 获取列表 + + + + + + + 根据id数组删除 + + ids + + + + + 查询表单数据 + + id + + + + + 添加 + + + + + + + 编辑 + + + + + + + 导出Excel + + + + 手机号登录表 控制器 diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json index 3d5d4d7..8be13d3 100644 --- a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json +++ b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json @@ -2,7 +2,7 @@ // 连接字符串 "ConnectionStrings": { // redis - "Redis": "124.220.55.158:6379,defaultDatabase=1" + "Redis": "124.220.55.158:6379,defaultDatabase=10" }, // pi计算 数据库管理 "AdminRepositoryOptions": { diff --git a/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev4/tempModel.cshtml b/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev4/tempModel.cshtml index 78f4c0d..6169f8b 100644 --- a/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev4/tempModel.cshtml +++ b/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev4/tempModel.cshtml @@ -98,6 +98,7 @@ namespace @(Model.Namespace).Repository.ChatAI.Admin.Entities.Apps; /// @(string.IsNullOrWhiteSpace(classNameRemark) ? className : classNameRemark) /// [EntityDescription(FieldIgnored = true)] +[Table("@className")] public class @className : @(GetIdType()) { diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/ChatAdminDbContext.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/ChatAdminDbContext.cs index 87fe63e..5fa82e6 100644 --- a/admin-server/MiaoYu.Repository.ChatAI.Admin/ChatAdminDbContext.cs +++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/ChatAdminDbContext.cs @@ -1,5 +1,7 @@ +using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; + namespace MiaoYu.Repository.ChatAI.Admin { /// @@ -24,14 +26,74 @@ namespace MiaoYu.Repository.ChatAI.Admin /// protected override void OnModelCreating(ModelBuilder modelBuilder) { - var dbContextConfigAttribute = GetType().GetCustomAttribute()!; - dbContextConfigAttribute!.OnModelCreating(modelBuilder, dbContextConfigAttribute.GetModelTypes(GetType())); - #region 自动迁移种子数据 + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("PK__T_Order__3214EC07C8DD7EE1"); + + entity.ToTable(tb => tb.HasComment("订单完成表")); + + entity.Property(e => e.CreatedAt) + .HasComment("创建时间") + .HasColumnType("datetime"); + entity.Property(e => e.OrderDate) + .HasComment("订单创建时间") + .HasColumnType("datetime"); + entity.Property(e => e.OrderId) + .HasMaxLength(64) + .HasComment("订单编号"); + entity.Property(e => e.PaymentDate) + .HasComment("订单支付时间") + .HasColumnType("datetime"); + entity.Property(e => e.PaymentDay).HasComment("订单创建天"); + entity.Property(e => e.PaymentMethod) + .HasMaxLength(10) + .HasComment("订单支付方式"); + entity.Property(e => e.ProductId) + .HasMaxLength(100) + .HasComment("购买的产品Id"); + entity.Property(e => e.Status).HasComment("订单状态"); + entity.Property(e => e.TenantId).HasComment("租户"); + entity.Property(e => e.TotalPrice) + .HasComment("价格") + .HasColumnType("money"); + entity.Property(e => e.UpdatedAt) + .HasComment("修改时间") + .HasColumnType("datetime"); + entity.Property(e => e.UserId).HasComment("用户Id"); + + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("PK__T_OrderI__3214EC077E53EC22"); + + entity.ToTable(tb => tb.HasComment("订单详情表")); + + entity.Property(e => e.OrderId) + .HasMaxLength(64) + .HasComment("订单id"); + entity.Property(e => e.PayUrl).HasComment("支付地址"); + entity.Property(e => e.PaymentInfo).HasComment("支付信息"); + entity.Property(e => e.Product).HasComment("产品id、主键"); + entity.Property(e => e.ProductId) + .HasMaxLength(100) + .HasComment("产品id"); + entity.Property(e => e.RewardInfo).HasComment("发放奖励信息"); + entity.Property(e => e.RewardTips).HasComment("发放奖励提示"); + entity.Property(e => e.TenantId).HasComment("租户"); + + }); + //OnModelCreatingPartial(modelBuilder); //ModelBuilderExtensions.Seed(modelBuilder); #endregion + var dbContextConfigAttribute = GetType().GetCustomAttribute()!; + var t = dbContextConfigAttribute.GetModelTypes(GetType()); + dbContextConfigAttribute!.OnModelCreating(modelBuilder, t); + + } diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/M_MusicGenres.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/M_MusicGenres.cs new file mode 100644 index 0000000..a823636 --- /dev/null +++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/M_MusicGenres.cs @@ -0,0 +1,36 @@ +namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps; + +/// +/// 存储不同音乐风格的信息。 +/// +[EntityDescription(FieldIgnored = true)] +[Table("M_MusicGenres")] +public class M_MusicGenres : DefaultEntityV4 +{ + + + /// + /// 音乐风格名称 => 备注: 音乐风格名称 + /// + public string? GenreName { get; set; } + + + /// + /// 音乐风格描述 => 备注: 音乐风格描述 + /// + public string? Description { get; set; } + + + /// + /// 排序 => 备注: 排序 + /// + public Int32 OrderId { get; set; } + + + /// + /// 是否启用 => 备注: 是否启用 + /// + public Boolean IsEnabled { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Order.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Order.cs new file mode 100644 index 0000000..0bd064e --- /dev/null +++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Order.cs @@ -0,0 +1,77 @@ +namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps; + +/// +/// 订单完成表 +/// +[EntityDescription(FieldIgnored = true)] +public class T_Order : DefaultEntityV4 +{ + + + /// + /// 订单编号 => 备注: 订单编号 + /// + public string? OrderId { get; set; } + + + /// + /// 用户Id => 备注: 用户Id + /// + public Int32 UserId { get; set; } + + + /// + /// 订单创建时间 => 备注: 订单创建时间 + /// + public DateTime OrderDate { get; set; } + + + /// + /// 订单支付时间 => 备注: 订单支付时间 + /// + public DateTime PaymentDate { get; set; } + + + /// + /// 订单支付方式 => 备注: 订单支付方式 + /// + public string? PaymentMethod { get; set; } + + + /// + /// 购买的产品Id => 备注: 购买的产品Id + /// + public string? ProductId { get; set; } + + + /// + /// 价格 => 备注: 价格 + /// + public Decimal TotalPrice { get; set; } + + + /// + /// 订单状态 => 备注: 订单状态 + /// + public Int32 Status { get; set; } + + + /// + /// 创建时间 => 备注: 创建时间 + /// + public DateTime CreatedAt { get; set; } + + + /// + /// 修改时间 => 备注: 修改时间 + /// + public DateTime UpdatedAt { get; set; } + + + /// + /// 订单创建天 => 备注: 订单创建天 + /// + public DateTime PaymentDay { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_OrderItems.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_OrderItems.cs new file mode 100644 index 0000000..7fa7593 --- /dev/null +++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_OrderItems.cs @@ -0,0 +1,54 @@ +namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps; + +/// +/// 订单详情表 +/// +[EntityDescription(FieldIgnored = true)] +[Table("T_OrderItems")] +public class T_OrderItems : DefaultEntityV4 +{ + + + /// + /// 产品id => 备注: 产品id + /// + public string? ProductId { get; set; } + + + /// + /// 订单id => 备注: 订单id + /// + public string? OrderId { get; set; } + + + /// + /// 发放奖励信息 => 备注: 发放奖励信息 + /// + public string? RewardInfo { get; set; } + + + /// + /// 产品id、主键 => 备注: 产品id、主键 + /// + public Int32 Product { get; set; } + + + /// + /// 支付信息 => 备注: 支付信息 + /// + public string? PaymentInfo { get; set; } + + + /// + /// 发放奖励提示 => 备注: 发放奖励提示 + /// + public string? RewardTips { get; set; } + + + /// + /// 支付地址 => 备注: 支付地址 + /// + public string? PayUrl { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_User_IntentOrder.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_User_IntentOrder.cs new file mode 100644 index 0000000..03383f6 --- /dev/null +++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_User_IntentOrder.cs @@ -0,0 +1,78 @@ +namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps; + +/// +/// 意向订单表 +/// +[EntityDescription(FieldIgnored = true)] +[Table("T_User_IntentOrder")] +public class T_User_IntentOrder : DefaultEntityV4 +{ + + + /// + /// 用户Id => 备注: 用户Id + /// + public Int32 UserId { get; set; } + + + /// + /// 产品id => 备注: 产品id + /// + public string? ProductId { get; set; } + + + /// + /// 支付方式 => 备注: 支付方式 + /// + public string? Method { get; set; } + + + /// + /// 价格 => 备注: 价格 + /// + public Decimal Price { get; set; } + + + /// + /// 数量 => 备注: 数量 + /// + public Int32 Quantity { get; set; } + + + /// + /// 状态 => 备注: 状态 + /// + public Int32 Status { get; set; } + + + /// + /// 备注 => 备注: 备注 + /// + public string? Notes { get; set; } + + + /// + /// 订单创建时间 => 备注: 订单创建时间 + /// + public DateTime IntentDate { get; set; } + + + /// + /// 创建时间 => 备注: 创建时间 + /// + public DateTime CreatedAt { get; set; } + + + /// + /// 修改时间 => 备注: 修改时间 + /// + public DateTime UpdatedAt { get; set; } + + + /// + /// 订单Id => 备注: 订单Id + /// + public string? OrderId { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml b/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml index 1db6f40..d9eb97d 100644 --- a/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml +++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml @@ -37,6 +37,31 @@ + + + 存储不同音乐风格的信息。 + + + + + 音乐风格名称 => 备注: 音乐风格名称 + + + + + 音乐风格描述 => 备注: 音乐风格描述 + + + + + 排序 => 备注: 排序 + + + + + 是否启用 => 备注: 是否启用 + + 发现页类别菜单 @@ -482,6 +507,106 @@ 其它的模板 + + + 订单完成表 + + + + + 订单编号 => 备注: 订单编号 + + + + + 用户Id => 备注: 用户Id + + + + + 订单创建时间 => 备注: 订单创建时间 + + + + + 订单支付时间 => 备注: 订单支付时间 + + + + + 订单支付方式 => 备注: 订单支付方式 + + + + + 购买的产品Id => 备注: 购买的产品Id + + + + + 价格 => 备注: 价格 + + + + + 订单状态 => 备注: 订单状态 + + + + + 创建时间 => 备注: 创建时间 + + + + + 修改时间 => 备注: 修改时间 + + + + + 订单创建天 => 备注: 订单创建天 + + + + + 订单详情表 + + + + + 产品id => 备注: 产品id + + + + + 订单id => 备注: 订单id + + + + + 发放奖励信息 => 备注: 发放奖励信息 + + + + + 产品id、主键 => 备注: 产品id、主键 + + + + + 支付信息 => 备注: 支付信息 + + + + + 发放奖励提示 => 备注: 发放奖励提示 + + + + + 支付地址 => 备注: 支付地址 + + 商城表 @@ -717,6 +842,66 @@ 修改时间 => 备注: 修改时间 + + + 意向订单表 + + + + + 用户Id => 备注: 用户Id + + + + + 产品id => 备注: 产品id + + + + + 支付方式 => 备注: 支付方式 + + + + + 价格 => 备注: 价格 + + + + + 数量 => 备注: 数量 + + + + + 状态 => 备注: 状态 + + + + + 备注 => 备注: 备注 + + + + + 订单创建时间 => 备注: 订单创建时间 + + + + + 创建时间 => 备注: 创建时间 + + + + + 修改时间 => 备注: 修改时间 + + + + + 订单Id => 备注: 订单Id + + 手机号登录表