diff --git a/admin-client/src/services/Apps/App/T_ProductsService.ts b/admin-client/src/services/Apps/App/T_ProductsService.ts new file mode 100644 index 0000000..3d8a9e4 --- /dev/null +++ b/admin-client/src/services/Apps/App/T_ProductsService.ts @@ -0,0 +1,16 @@ +import Http from "@/core/utils/Http"; +import BaseService from '@/services/base/BaseService' + +/** + * T_Products服务 + */ +export class T_ProductsService extends BaseService { + + constructor() { + console.log('执行构造函数'); + super("/api/v1/admin/Game/T_Products"); + } + +} + +export default new T_ProductsService(); \ No newline at end of file diff --git a/admin-client/src/services/Apps/App/T_Products_RewardService.ts b/admin-client/src/services/Apps/App/T_Products_RewardService.ts new file mode 100644 index 0000000..d46b490 --- /dev/null +++ b/admin-client/src/services/Apps/App/T_Products_RewardService.ts @@ -0,0 +1,23 @@ +import Http from "@/core/utils/Http"; +import BaseService from '@/services/base/BaseService' + +/** + * T_Products_Reward服务 + */ +export class T_Products_RewardService extends BaseService { + + constructor() { + console.log('执行构造函数'); + super("/api/v1/admin/Game/T_Products_Reward"); + } + /** + * 获取数据列表 + * @param productId + * @returns + */ + getList(productId: number) { + return Http.get(`${this.urlPrefix}/findList/${productId}`,) + } +} + +export default new T_Products_RewardService(); \ No newline at end of file diff --git a/admin-client/src/services/Apps/App/T_SevenDaySignInService.ts b/admin-client/src/services/Apps/App/T_SevenDaySignInService.ts new file mode 100644 index 0000000..84f25e3 --- /dev/null +++ b/admin-client/src/services/Apps/App/T_SevenDaySignInService.ts @@ -0,0 +1,16 @@ +import Http from "@/core/utils/Http"; +import BaseService from '@/services/base/BaseService' + +/** + * T_SevenDaySignIn服务 + */ +export class T_SevenDaySignInService extends BaseService { + + constructor() { + console.log('执行构造函数'); + super("/api/v1/admin/Game/T_SevenDaySignIn"); + } + +} + +export default new T_SevenDaySignInService(); \ No newline at end of file diff --git a/admin-client/src/services/Apps/App/T_SevenDaySignIn_RewardService.ts b/admin-client/src/services/Apps/App/T_SevenDaySignIn_RewardService.ts new file mode 100644 index 0000000..ff9945c --- /dev/null +++ b/admin-client/src/services/Apps/App/T_SevenDaySignIn_RewardService.ts @@ -0,0 +1,24 @@ +import Http from "@/core/utils/Http"; +import BaseService from '@/services/base/BaseService' + +/** + * T_SevenDaySignIn_Reward服务 + */ +export class T_SevenDaySignIn_RewardService extends BaseService { + + constructor() { + console.log('执行构造函数'); + super("/api/v1/admin/Game/T_SevenDaySignIn_Reward"); + } + + /** + * 获取数据列表 + * @param productId + * @returns + */ + getList(productId: number) { + return Http.get(`${this.urlPrefix}/findList/${productId}`,) + } +} + +export default new T_SevenDaySignIn_RewardService(); \ No newline at end of file diff --git a/admin-client/src/views/Apps/App/T_GameCBTs/Info.vue b/admin-client/src/views/Apps/App/T_GameCBTs/Info.vue index f19e78a..860308e 100644 --- a/admin-client/src/views/Apps/App/T_GameCBTs/Info.vue +++ b/admin-client/src/views/Apps/App/T_GameCBTs/Info.vue @@ -247,7 +247,7 @@ const gameChanged = (option: any) => { @@ -255,32 +255,32 @@ const gameChanged = (option: any) => { - + - - + + - - + + - + - - + + diff --git a/admin-client/src/views/Apps/App/T_Products_Rewards/Index.vue b/admin-client/src/views/Apps/App/T_Products_Rewards/Index.vue new file mode 100644 index 0000000..f0bb175 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_Products_Rewards/Index.vue @@ -0,0 +1,244 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/Apps/App/T_Products_Rewards/Info.vue b/admin-client/src/views/Apps/App/T_Products_Rewards/Info.vue new file mode 100644 index 0000000..df700ff --- /dev/null +++ b/admin-client/src/views/Apps/App/T_Products_Rewards/Info.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/Apps/App/T_Productss/Index.vue b/admin-client/src/views/Apps/App/T_Productss/Index.vue new file mode 100644 index 0000000..043d06f --- /dev/null +++ b/admin-client/src/views/Apps/App/T_Productss/Index.vue @@ -0,0 +1,469 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_Productss/Info.vue b/admin-client/src/views/Apps/App/T_Productss/Info.vue new file mode 100644 index 0000000..5c91754 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_Productss/Info.vue @@ -0,0 +1,221 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_Productss/InfoRawards.vue b/admin-client/src/views/Apps/App/T_Productss/InfoRawards.vue new file mode 100644 index 0000000..64a8af5 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_Productss/InfoRawards.vue @@ -0,0 +1,134 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_Productss/InfoRawardsList.vue b/admin-client/src/views/Apps/App/T_Productss/InfoRawardsList.vue new file mode 100644 index 0000000..6316c08 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_Productss/InfoRawardsList.vue @@ -0,0 +1,172 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_SevenDaySignIn_Rewards/Index.vue b/admin-client/src/views/Apps/App/T_SevenDaySignIn_Rewards/Index.vue new file mode 100644 index 0000000..d056256 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_SevenDaySignIn_Rewards/Index.vue @@ -0,0 +1,277 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_SevenDaySignIn_Rewards/Info.vue b/admin-client/src/views/Apps/App/T_SevenDaySignIn_Rewards/Info.vue new file mode 100644 index 0000000..6eb475d --- /dev/null +++ b/admin-client/src/views/Apps/App/T_SevenDaySignIn_Rewards/Info.vue @@ -0,0 +1,92 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/Apps/App/T_SevenDaySignIns/Index.vue b/admin-client/src/views/Apps/App/T_SevenDaySignIns/Index.vue new file mode 100644 index 0000000..ea81137 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_SevenDaySignIns/Index.vue @@ -0,0 +1,311 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_SevenDaySignIns/Info.vue b/admin-client/src/views/Apps/App/T_SevenDaySignIns/Info.vue new file mode 100644 index 0000000..c95a066 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_SevenDaySignIns/Info.vue @@ -0,0 +1,130 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_SevenDaySignIns/InfoRawards.vue b/admin-client/src/views/Apps/App/T_SevenDaySignIns/InfoRawards.vue new file mode 100644 index 0000000..ca816c8 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_SevenDaySignIns/InfoRawards.vue @@ -0,0 +1,121 @@ + + + diff --git a/admin-client/src/views/Apps/App/T_SevenDaySignIns/SevenRawards.vue b/admin-client/src/views/Apps/App/T_SevenDaySignIns/SevenRawards.vue new file mode 100644 index 0000000..fc5f1d2 --- /dev/null +++ b/admin-client/src/views/Apps/App/T_SevenDaySignIns/SevenRawards.vue @@ -0,0 +1,164 @@ + + + diff --git a/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_PopupService.cs b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_PopupService.cs index c076f34..f37202a 100644 --- a/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_PopupService.cs +++ b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_PopupService.cs @@ -5,7 +5,7 @@ namespace CloudGaming.Api.Admin.ApplicationServices.Apps.App; /// 通用弹框配置 服务 T_PopupService /// public class T_PopupService(IServiceProvider serviceProvider) -: ApplicationUserService(serviceProvider) +: ApplicationUserService(serviceProvider) { @@ -21,13 +21,26 @@ public class T_PopupService(IServiceProvider serviceProvider) .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.Name), w => w.Name.Contains(pagingSearchInput.Search.Name ?? "")) //弹框类型 - .WhereIf(pagingSearchInput.Search?.Type!=null&&pagingSearchInput.Search?.Type>0, - w => w.Type== pagingSearchInput.Search.Type) - .OrderByDescending(w => w.Id) + .WhereIf(pagingSearchInput.Search?.Type != null && pagingSearchInput.Search?.Type > 0, + w => w.Type == pagingSearchInput.Search.Type) + .OrderBy(w => w.OrderId) .Select(w => new { w.Id, - w.TenantId,w.Type,w.Name,w.Text,w.OrderId,w.BgImageId,w.Btn_OK,w.Btn_Close,w.Desc,w.Channel,w.PlatformId,w.IsOnline,w.CreateTime,w.UpdateTime, + w.TenantId, + w.Type, + w.Name, + w.Text, + w.OrderId, + w.BgImageId, + w.Btn_OK, + w.Btn_Close, + w.Desc, + w.Channel, + w.PlatformId, + w.IsOnline, + w.CreateTime, + w.UpdateTime, }) ; var result = await Repository.AsPagingViewAsync(query, pagingSearchInput); @@ -35,12 +48,12 @@ public class T_PopupService(IServiceProvider serviceProvider) // 设置列 //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); //result.GetColumn(query, w => w. !).SetColumn(w => w.Name!); - + result .FormatValue(query, w => w.CreateTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) .FormatValue(query, w => w.UpdateTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) ; - + return result; } diff --git a/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_ProductsService.cs b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_ProductsService.cs new file mode 100644 index 0000000..1720ff7 --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_ProductsService.cs @@ -0,0 +1,65 @@ +using CloudGaming.Repository.Game.Entities.App; +namespace CloudGaming.Api.Admin.ApplicationServices.Apps.App; + +/// +/// 商城表 服务 T_ProductsService +/// +public class T_ProductsService(IServiceProvider serviceProvider) +: ApplicationUserService(serviceProvider) +{ + + + /// + /// 获取列表数据 + /// + /// + /// + public async override Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this.Repository.Select + //道具Id + .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.ProductId), + w => w.ProductId.Contains(pagingSearchInput.Search.ProductId ?? "")) + //道具名称 + .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.ProductName), + w => w.ProductName.Contains(pagingSearchInput.Search.ProductName ?? "")) + //道具类型 + .WhereIf(pagingSearchInput.Search?.ProductType != null && pagingSearchInput.Search?.ProductType > 0, + w => w.ProductType == pagingSearchInput.Search.ProductType) + .OrderBy(w => w.OrderById) + .Select(w => new + { + w.Id, + w.TenantId, + w.ProductId, + w.ProductName, + w.ProductType, + w.ProductDesc, + w.Price, + w.ImageId, + w.IsEnable, + w.IsFirstCharge, + w.FirstChargeImageId, + w.FirstChargePrice, + w.CreateTime, + w.UpdateTime, + w.OrderById, + w.SelectImageId, + w.SelectFirstChargeImageId, + }) + ; + var result = await Repository.AsPagingViewAsync(query, pagingSearchInput); + + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w. !).SetColumn(w => w.Name!); + + result + .FormatValue(query, w => w.CreateTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + .FormatValue(query, w => w.UpdateTime, (oldValue) => oldValue?.ToString("yyyy-MM-dd")) + ; + + return result; + } + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_Products_RewardService.cs b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_Products_RewardService.cs new file mode 100644 index 0000000..a8ee31e --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_Products_RewardService.cs @@ -0,0 +1,50 @@ +using CloudGaming.Repository.Game.Entities.App; +namespace CloudGaming.Api.Admin.ApplicationServices.Apps.App; + +/// +/// 产品表奖励 服务 T_Products_RewardService +/// +public class T_Products_RewardService(IServiceProvider serviceProvider) +: ApplicationUserService(serviceProvider) +{ + + + /// + /// 获取列表数据 + /// + /// + /// + public async override Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this.Repository.Select + .OrderByDescending(w => w.Id) + .Select(w => new + { + w.Id, + w.CurrencyType, + w.Money, + w.T_ProductId, + w.FirstChargeMoney, + w.ProductId, + w.TenantId, + }) + ; + var result = await Repository.AsPagingViewAsync(query, pagingSearchInput); + + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w. !).SetColumn(w => w.Name!); + return result; + } + /// + /// 获取列表数据 + /// + /// + /// + public async Task> FindListAsync(int productId) + { + var query = await this.Repository.SelectNoTracking.Where(it => it.T_ProductId == productId).OrderByDescending(w => w.Id).ToListAsync(); + return query; + } + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_SevenDaySignInService.cs b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_SevenDaySignInService.cs new file mode 100644 index 0000000..6943aa6 --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_SevenDaySignInService.cs @@ -0,0 +1,47 @@ +using CloudGaming.Repository.Game.Entities.App; +namespace CloudGaming.Api.Admin.ApplicationServices.Apps.App; + +/// +/// 七日签到配置表 服务 T_SevenDaySignInService +/// +public class T_SevenDaySignInService(IServiceProvider serviceProvider) +: ApplicationUserService(serviceProvider) +{ + + + /// + /// 获取列表数据 + /// + /// + /// + public async override Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this.Repository.Select + .OrderBy(w => w.OrderId) + .Select(w => new + { + w.Id, + w.Name, + w.ImageId, + w.OrderId, + w.CreateTime, + w.UpdateTime, + w.Remark, + w.TenantId, + }) + ; + var result = await Repository.AsPagingViewAsync(query, pagingSearchInput); + + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w. !).SetColumn(w => w.Name!); + + result + .FormatValue(query, w => w.CreateTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + .FormatValue(query, w => w.UpdateTime, (oldValue) => oldValue.ToString("yyyy-MM-dd")) + ; + + return result; + } + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_SevenDaySignIn_RewardService.cs b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_SevenDaySignIn_RewardService.cs new file mode 100644 index 0000000..2cc7705 --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/ApplicationServices/Apps/App/T_SevenDaySignIn_RewardService.cs @@ -0,0 +1,49 @@ +using CloudGaming.Repository.Game.Entities.App; +namespace CloudGaming.Api.Admin.ApplicationServices.Apps.App; + +/// +/// 七日签到奖励配置表 服务 T_SevenDaySignIn_RewardService +/// +public class T_SevenDaySignIn_RewardService(IServiceProvider serviceProvider) +: ApplicationUserService(serviceProvider) +{ + + + /// + /// 获取列表数据 + /// + /// + /// + public async override Task FindListAsync(PagingSearchInput pagingSearchInput) + { + var query = this.Repository.Select + .OrderByDescending(w => w.Id) + .Select(w => new + { + w.Id, + w.SigninId, + w.CurrencyType, + w.AwardNum, + w.TenantId, + }) + ; + var result = await Repository.AsPagingViewAsync(query, pagingSearchInput); + + // 设置列 + //result.GetColumn(query, w => w.OperatorName).SetColumn("操作人"); + //result.GetColumn(query, w => w. !).SetColumn(w => w.Name!); + return result; + } + + /// + /// 获取列表数据 + /// + /// + /// + public async Task> FindListAsync(int signinId) + { + var query = await this.Repository.SelectNoTracking.Where(it => it.SigninId == signinId).OrderByDescending(w => w.Id).ToListAsync(); + return query; + } + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/CloudGaming.Api.Admin.xml b/admin-server/CloudGaming.Api.Admin/CloudGaming.Api.Admin.xml index 39ddfdd..d5259f1 100644 --- a/admin-server/CloudGaming.Api.Admin/CloudGaming.Api.Admin.xml +++ b/admin-server/CloudGaming.Api.Admin/CloudGaming.Api.Admin.xml @@ -222,6 +222,88 @@ + + + 商城表 服务 T_ProductsService + + + + + 商城表 服务 T_ProductsService + + + + + 获取列表数据 + + + + + + + 产品表奖励 服务 T_Products_RewardService + + + + + 产品表奖励 服务 T_Products_RewardService + + + + + 获取列表数据 + + + + + + + 获取列表数据 + + + + + + + 七日签到配置表 服务 T_SevenDaySignInService + + + + + 七日签到配置表 服务 T_SevenDaySignInService + + + + + 获取列表数据 + + + + + + + 七日签到奖励配置表 服务 T_SevenDaySignIn_RewardService + + + + + 七日签到奖励配置表 服务 T_SevenDaySignIn_RewardService + + + + + 获取列表数据 + + + + + + + 获取列表数据 + + + + 服务 WeChatConfigService @@ -1726,6 +1808,60 @@ 通用弹框配置 控制器 + + + 商城表 控制器 + + + + + 商城表 控制器 + + + + + 产品表奖励 控制器 + + + + + 产品表奖励 控制器 + + + + + 获取列表 + + + + + + + 七日签到配置表 控制器 + + + + + 七日签到配置表 控制器 + + + + + 七日签到奖励配置表 控制器 + + + + + 七日签到奖励配置表 控制器 + + + + + 获取列表 + + + + 控制器 diff --git a/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_ProductsController.cs b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_ProductsController.cs new file mode 100644 index 0000000..a92e7cb --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_ProductsController.cs @@ -0,0 +1,13 @@ +using CloudGaming.Repository.Game.Entities.App; +using CloudGaming.Api.Admin.ApplicationServices.Apps.App; +namespace CloudGaming.Api.Admin.Controllers.Apps.App; + +/// +/// 商城表 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "商城表")] +public class T_ProductsController(IServiceProvider serviceProvider) +: AdminGameControllerBase(serviceProvider) +{ + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_Products_RewardController.cs b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_Products_RewardController.cs new file mode 100644 index 0000000..4dfc7d2 --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_Products_RewardController.cs @@ -0,0 +1,23 @@ +using CloudGaming.Repository.Game.Entities.App; +using CloudGaming.Api.Admin.ApplicationServices.Apps.App; +namespace CloudGaming.Api.Admin.Controllers.Apps.App; + +/// +/// 产品表奖励 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "产品表奖励")] +public class T_Products_RewardController(IServiceProvider serviceProvider) +: AdminGameControllerBase(serviceProvider) +{ + /// + /// 获取列表 + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Display, DisplayName = "查看数据")] + [HttpGet("{productId?}")] + public async Task> FindListAsync([FromRoute] int productId) + { + return await this.Service.FindListAsync(productId); + } +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_SevenDaySignInController.cs b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_SevenDaySignInController.cs new file mode 100644 index 0000000..bff0d03 --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_SevenDaySignInController.cs @@ -0,0 +1,13 @@ +using CloudGaming.Repository.Game.Entities.App; +using CloudGaming.Api.Admin.ApplicationServices.Apps.App; +namespace CloudGaming.Api.Admin.Controllers.Apps.App; + +/// +/// 七日签到配置表 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "七日签到配置表")] +public class T_SevenDaySignInController(IServiceProvider serviceProvider) +: AdminGameControllerBase(serviceProvider) +{ + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_SevenDaySignIn_RewardController.cs b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_SevenDaySignIn_RewardController.cs new file mode 100644 index 0000000..02edb85 --- /dev/null +++ b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/App/T_SevenDaySignIn_RewardController.cs @@ -0,0 +1,25 @@ +using CloudGaming.Repository.Game.Entities.App; +using CloudGaming.Api.Admin.ApplicationServices.Apps.App; +using Org.BouncyCastle.Cms; +namespace CloudGaming.Api.Admin.Controllers.Apps.App; + +/// +/// 七日签到奖励配置表 控制器 +/// +[ControllerDescriptor(MenuId = "请设置菜单Id 系统菜单表中查找,如果不设置不受权限保护!", DisplayName = "七日签到奖励配置表")] +public class T_SevenDaySignIn_RewardController(IServiceProvider serviceProvider) +: AdminGameControllerBase(serviceProvider) +{ + + /// + /// 获取列表 + /// + /// + /// + [ActionDescriptor(PermissionFunctionConsts.Function_Display, DisplayName = "查看数据")] + [HttpGet("{signinId?}")] + public async Task> FindListAsync([FromRoute] int signinId) + { + return await this.Service.FindListAsync(signinId); + } +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Api.Admin/Controllers/Apps/Ext/T_App_ImageController.cs b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/Ext/T_App_ImageController.cs index f82f663..4e28427 100644 --- a/admin-server/CloudGaming.Api.Admin/Controllers/Apps/Ext/T_App_ImageController.cs +++ b/admin-server/CloudGaming.Api.Admin/Controllers/Apps/Ext/T_App_ImageController.cs @@ -16,7 +16,7 @@ public class T_App_ImageController(IServiceProvider serviceProvider) var url = await Service.GetImageUrl(imageId, language); if (process == 0) { - url += "?x-oss-process=image/quality,q_1/resize,h_40"; + url += "?x-oss-process=image/quality,q_1/resize,w_100"; } return Redirect(url); } diff --git a/admin-server/CloudGaming.Api.Admin/appsettings.Development.json b/admin-server/CloudGaming.Api.Admin/appsettings.Development.json index 2684930..a27de8a 100644 --- a/admin-server/CloudGaming.Api.Admin/appsettings.Development.json +++ b/admin-server/CloudGaming.Api.Admin/appsettings.Development.json @@ -11,7 +11,7 @@ //是否监控EFCore程序 "IsMonitorEFCore": false, // 连接字符串 - mysql - "ConnectionString": "Server=192.168.1.17;Database=HZY;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;" + "ConnectionString": "Server=192.168.1.18;Database=HZY;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;" //// 连接字符串 - sqlserver //"ConnectionString": "Server=.;Database=hzy_microservices_sqlserver_20230227;User ID=sa;Password=123456;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;", //// 连接字符串 - postgresql diff --git a/admin-server/CloudGaming.Code.DataBaseModel/BaseDbContext.cs b/admin-server/CloudGaming.Code.DataBaseModel/BaseDbContext.cs index 732ff40..14c9e55 100644 --- a/admin-server/CloudGaming.Code.DataBaseModel/BaseDbContext.cs +++ b/admin-server/CloudGaming.Code.DataBaseModel/BaseDbContext.cs @@ -39,10 +39,10 @@ public class BaseDbContext : DbContext, IBaseDbContext { _appConfig = new AppConfig { - ExtConnectionString = "Server=192.168.1.17;Database=CloudGamingCBT;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", - GameConnectionString = "Server=192.168.1.17;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", - PhoneConnectionString = "Server=192.168.1.17;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", - UserConnectionString = "Server=192.168.1.17;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + ExtConnectionString = "Server=192.168.1.18;Database=CloudGamingCBT;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + GameConnectionString = "Server=192.168.1.18;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + PhoneConnectionString = "Server=192.168.1.18;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + UserConnectionString = "Server=192.168.1.18;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", }; } _appDataBaseType = appDataBaseType; diff --git a/admin-server/CloudGaming.Repository.Game/CloudGaming.Repository.Game.xml b/admin-server/CloudGaming.Repository.Game/CloudGaming.Repository.Game.xml index 413a7de..71699e8 100644 --- a/admin-server/CloudGaming.Repository.Game/CloudGaming.Repository.Game.xml +++ b/admin-server/CloudGaming.Repository.Game/CloudGaming.Repository.Game.xml @@ -459,6 +459,171 @@ 按钮延迟显示 => 备注: 延迟几秒显示按钮 + + + 商城表 + + + + + 道具Id => 备注: 道具Id + + + + + 道具名称 => 备注: 道具名称 + + + + + 道具类型 => 备注: 道具类型,0我的商城 + + + + + 道具描述 => 备注: 道具描述 + + + + + 价格 => 备注: 价格 + + + + + 图片· => 备注: 道具图片配置 图片id + + + + + 是否启用 => 备注: 是否启用 + + + + + 是否有首充 => 备注: 是否有首充 + + + + + 首充图片 => 备注: 首充图片 + + + + + 首充价格 => 备注: 首充价格 + + + + + 创建时间 => 备注: 创建时间 + + + + + 更新时间 => 备注: 更新时间 + + + + + 排序 => 备注: 排序 + + + + + 选中图片 => 备注: 选中图片 + + + + + 选中首充图片 => 备注: 选中首充图片 + + + + + 产品表奖励 + + + + + 奖励类型 => 备注: 奖励类型 + + + + + 奖励 => 备注: 奖励 + + + + + 所属商品 => 备注: 所属商品 + + + + + 首充奖励 => 备注: 首充送多少奖励 + + + + + 所属商品 => 备注: 所属商品 + + + + + 七日签到配置表 + + + + + 名称 => 备注: 名称 + + + + + 签到图片 => 备注: 签到图片 + + + + + 排序 => 备注: 排序 + + + + + 创建时间 => 备注: 创建时间 + + + + + 修改时间 => 备注: 修改时间 + + + + + 备注 => 备注: 备注 + + + + + 七日签到奖励配置表 + + + + + 七天签到id => 备注: 七天签到id + + + + + 奖励类型 => 备注: 奖励类型 + + + + + 奖励数量 => 备注: 奖励数量 + + 图片列表 diff --git a/admin-server/CloudGaming.Repository.Game/Entities/App/T_Products.cs b/admin-server/CloudGaming.Repository.Game/Entities/App/T_Products.cs new file mode 100644 index 0000000..ee80f73 --- /dev/null +++ b/admin-server/CloudGaming.Repository.Game/Entities/App/T_Products.cs @@ -0,0 +1,102 @@ +namespace CloudGaming.Repository.Game.Entities.App; + +/// +/// 商城表 +/// +[Table("T_Products")] +[EntityDescription(NameRuleMode = NameRuleMode.TableName, NameRuleType= NameRuleType.UpperSnakeCase)] +public class T_Products : DefaultGameAppEntity +{ + + + /// + /// 道具Id => 备注: 道具Id + /// + public string? ProductId { get; set; } + + + /// + /// 道具名称 => 备注: 道具名称 + /// + public string? ProductName { get; set; } + + + /// + /// 道具类型 => 备注: 道具类型,0我的商城 + /// + public Int32 ProductType { get; set; } + + + /// + /// 道具描述 => 备注: 道具描述 + /// + public string? ProductDesc { get; set; } + + + /// + /// 价格 => 备注: 价格 + /// + public Decimal Price { get; set; } + + + /// + /// 图片· => 备注: 道具图片配置 图片id + /// + public Int32 ImageId { get; set; } + + + /// + /// 是否启用 => 备注: 是否启用 + /// + public Boolean IsEnable { get; set; } + + + /// + /// 是否有首充 => 备注: 是否有首充 + /// + public Boolean IsFirstCharge { get; set; } + + + /// + /// 首充图片 => 备注: 首充图片 + /// + public Int32? FirstChargeImageId { get; set; } + + + /// + /// 首充价格 => 备注: 首充价格 + /// + public Decimal? FirstChargePrice { get; set; } + + + /// + /// 创建时间 => 备注: 创建时间 + /// + public DateTime CreateTime { get; set; } + + + /// + /// 更新时间 => 备注: 更新时间 + /// + public DateTime? UpdateTime { get; set; } + + + /// + /// 排序 => 备注: 排序 + /// + public Int32? OrderById { get; set; } + + + /// + /// 选中图片 => 备注: 选中图片 + /// + public Int32? SelectImageId { get; set; } + + + /// + /// 选中首充图片 => 备注: 选中首充图片 + /// + public Int32? SelectFirstChargeImageId { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Repository.Game/Entities/App/T_Products_Reward.cs b/admin-server/CloudGaming.Repository.Game/Entities/App/T_Products_Reward.cs new file mode 100644 index 0000000..2c7cf4a --- /dev/null +++ b/admin-server/CloudGaming.Repository.Game/Entities/App/T_Products_Reward.cs @@ -0,0 +1,42 @@ +namespace CloudGaming.Repository.Game.Entities.App; + +/// +/// 产品表奖励 +/// +[Table("T_Products_Reward")] +[EntityDescription(NameRuleMode = NameRuleMode.TableName, NameRuleType= NameRuleType.UpperSnakeCase)] +public class T_Products_Reward : DefaultGameAppEntity +{ + + + /// + /// 奖励类型 => 备注: 奖励类型 + /// + public Int32 CurrencyType { get; set; } + + + /// + /// 奖励 => 备注: 奖励 + /// + public Int32 Money { get; set; } + + + /// + /// 所属商品 => 备注: 所属商品 + /// + public Int32? T_ProductId { get; set; } + + + /// + /// 首充奖励 => 备注: 首充送多少奖励 + /// + public Int32? FirstChargeMoney { get; set; } + + + /// + /// 所属商品 => 备注: 所属商品 + /// + public string? ProductId { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Repository.Game/Entities/App/T_SevenDaySignIn.cs b/admin-server/CloudGaming.Repository.Game/Entities/App/T_SevenDaySignIn.cs new file mode 100644 index 0000000..16f39b8 --- /dev/null +++ b/admin-server/CloudGaming.Repository.Game/Entities/App/T_SevenDaySignIn.cs @@ -0,0 +1,48 @@ +namespace CloudGaming.Repository.Game.Entities.App; + +/// +/// 七日签到配置表 +/// +[Table("T_SevenDaySignIn")] +[EntityDescription(NameRuleMode = NameRuleMode.TableName, NameRuleType= NameRuleType.UpperSnakeCase)] +public class T_SevenDaySignIn : DefaultGameAppEntity +{ + + + /// + /// 名称 => 备注: 名称 + /// + public string? Name { get; set; } + + + /// + /// 签到图片 => 备注: 签到图片 + /// + public Int32 ImageId { get; set; } + + + /// + /// 排序 => 备注: 排序 + /// + public Int32 OrderId { get; set; } + + + /// + /// 创建时间 => 备注: 创建时间 + /// + public DateTime CreateTime { get; set; } + + + /// + /// 修改时间 => 备注: 修改时间 + /// + public DateTime UpdateTime { get; set; } + + + /// + /// 备注 => 备注: 备注 + /// + public string? Remark { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Repository.Game/Entities/App/T_SevenDaySignIn_Reward.cs b/admin-server/CloudGaming.Repository.Game/Entities/App/T_SevenDaySignIn_Reward.cs new file mode 100644 index 0000000..a1506db --- /dev/null +++ b/admin-server/CloudGaming.Repository.Game/Entities/App/T_SevenDaySignIn_Reward.cs @@ -0,0 +1,30 @@ +namespace CloudGaming.Repository.Game.Entities.App; + +/// +/// 七日签到奖励配置表 +/// +[Table("T_SevenDaySignIn_Reward")] +[EntityDescription(NameRuleMode = NameRuleMode.TableName, NameRuleType= NameRuleType.UpperSnakeCase)] +public class T_SevenDaySignIn_Reward : DefaultGameAppEntity +{ + + + /// + /// 七天签到id => 备注: 七天签到id + /// + public Int32 SigninId { get; set; } + + + /// + /// 奖励类型 => 备注: 奖励类型 + /// + public Int32 CurrencyType { get; set; } + + + /// + /// 奖励数量 => 备注: 奖励数量 + /// + public Int32 AwardNum { get; set; } + + +} \ No newline at end of file diff --git a/admin-server/CloudGaming.Repository.Game/GameRepositoryStartup.cs b/admin-server/CloudGaming.Repository.Game/GameRepositoryStartup.cs index 0f1681e..9ffa7b5 100644 --- a/admin-server/CloudGaming.Repository.Game/GameRepositoryStartup.cs +++ b/admin-server/CloudGaming.Repository.Game/GameRepositoryStartup.cs @@ -25,10 +25,10 @@ public class GameRepositoryStartup : StartupModule var webHostEnvironment = webApplicationBuilder.Environment; var _appConfig = new AppConfig { - ExtConnectionString = "Server=192.168.1.17;Database=CloudGamingCBT;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", - GameConnectionString = "Server=192.168.1.17;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", - PhoneConnectionString = "Server=192.168.1.17;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", - UserConnectionString = "Server=192.168.1.17;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + ExtConnectionString = "Server=192.168.1.18;Database=CloudGamingCBT;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + GameConnectionString = "Server=192.168.1.18;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + PhoneConnectionString = "Server=192.168.1.18;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", + UserConnectionString = "Server=192.168.1.18;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;", }; AddDbContextAndRepositories(services, _appConfig, AppDataBaseType.Game);