diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Collectibles/CollectiblesUserGetInput.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Collectibles/CollectiblesUserGetInput.cs new file mode 100644 index 00000000..f787108c --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Collectibles/CollectiblesUserGetInput.cs @@ -0,0 +1,8 @@ +using Yi.Framework.Ddd.Application.Contracts; + +namespace Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Collectibles; + +public class CollectiblesUserGetInput:PagedAllResultRequestDto +{ + +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Collectibles/CollectiblesUserGetOutputDto.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Collectibles/CollectiblesUserGetOutputDto.cs new file mode 100644 index 00000000..17de60d2 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Collectibles/CollectiblesUserGetOutputDto.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Application.Dtos; + +namespace Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Collectibles; + +public class CollectiblesUserGetOutputDto:EntityDto +{ + +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Market/MarketGetListInput.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Market/MarketGetListInput.cs new file mode 100644 index 00000000..c16ad714 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Market/MarketGetListInput.cs @@ -0,0 +1,9 @@ +using Volo.Abp.Application.Dtos; +using Yi.Framework.Ddd.Application.Contracts; + +namespace Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Market; + +public class MarketGetListInput:PagedAllResultRequestDto +{ + +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Market/MarketGetListOutputDto.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Market/MarketGetListOutputDto.cs new file mode 100644 index 00000000..3dd8cd17 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/Market/MarketGetListOutputDto.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Application.Dtos; + +namespace Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Market; + +public class MarketGetListOutputDto:EntityDto +{ + +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Yi.Framework.DigitalCollectibles.Application.Contracts.csproj b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Yi.Framework.DigitalCollectibles.Application.Contracts.csproj index 459a825b..32a468f2 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Yi.Framework.DigitalCollectibles.Application.Contracts.csproj +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Yi.Framework.DigitalCollectibles.Application.Contracts.csproj @@ -7,7 +7,6 @@ - diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs new file mode 100644 index 00000000..e68bed84 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Collectibles; +using Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Market; + +namespace Yi.Framework.DigitalCollectibles.Application.Services; + +/// +/// 藏品应用服务 +/// +public class CollectiblesService:ApplicationService +{ + /// + /// 获取当前用户的藏品 + /// + /// + /// + /// + [HttpGet("user")] + [Authorize] + public async Task> GetForAccountUserAsync(CollectiblesUserGetInput input) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs new file mode 100644 index 00000000..a16c4da6 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs @@ -0,0 +1,22 @@ +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.Market; + +namespace Yi.Framework.DigitalCollectibles.Application.Services; + +/// +/// 市场应用服务 +/// +public class MarketService:ApplicationService +{ + /// + /// 交易市场查询 + /// + /// + /// + /// + public async Task> GetListAsync(MarketGetListInput input) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj index 5acacbf7..3a010e50 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj @@ -9,9 +9,4 @@ - - - - - diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Consts/RarityEnum.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Consts/RarityEnum.cs new file mode 100644 index 00000000..a1cc1156 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Consts/RarityEnum.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; + +namespace Yi.Framework.DigitalCollectibles.Domain.Shared.Consts; + +/// +/// 稀有度枚举 +/// +public enum RarityEnum +{ + [Display(Name = "普通")] Ordinary = 0, + [Display(Name = "高级")] Senior = 1, + [Display(Name = "稀有")] Rare = 2, + [Display(Name = "珍品")] Gem = 3, + [Display(Name = "传说")] Legend = 4 +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Yi.Framework.DigitalCollectibles.Domain.Shared.csproj b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Yi.Framework.DigitalCollectibles.Domain.Shared.csproj index 12f4e3ed..186bab0b 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Yi.Framework.DigitalCollectibles.Domain.Shared.csproj +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Yi.Framework.DigitalCollectibles.Domain.Shared.csproj @@ -10,7 +10,6 @@ - diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesAggregateRoot.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesAggregateRoot.cs index aab2c913..640c60e0 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesAggregateRoot.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesAggregateRoot.cs @@ -1,5 +1,7 @@ using SqlSugar; using Volo.Abp.Domain.Entities.Auditing; +using Yi.Framework.Core.Data; +using Yi.Framework.DigitalCollectibles.Domain.Shared.Consts; namespace Yi.Framework.DigitalCollectibles.Domain.Entities; @@ -8,7 +10,45 @@ namespace Yi.Framework.DigitalCollectibles.Domain.Entities; /// 用于定义数字藏品 /// [SugarTable("DC_Collectibles")] -public class CollectiblesAggregateRoot:FullAuditedAggregateRoot +public class CollectiblesAggregateRoot:FullAuditedAggregateRoot,IOrderNum { + /// + /// 藏品编号 + /// + public string Code { get; set; } + + /// + /// 藏品名称 + /// + public string Name { get; set; } + + /// + /// 藏品描述 + /// + public string? Describe { get; set; } + + /// + /// 价值数 + /// + public decimal ValueNumber { get; set; } + + /// + /// 藏品地址 + /// + public string Url { get; set; } + /// + /// 稀有度 + /// + public RarityEnum Rarity{ get; set; } + + /// + /// 总共出现次数 + /// + public int FindTotal { get; set; } + + /// + /// 排序 + /// + public int OrderNum { get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserExtraInfoEntity.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserExtraInfoEntity.cs index 5505ec40..e0dd6e5f 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserExtraInfoEntity.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserExtraInfoEntity.cs @@ -10,5 +10,18 @@ namespace Yi.Framework.DigitalCollectibles.Domain.Entities; [SugarTable("DC_CollectiblesUserExtraInfo")] public class CollectiblesUserExtraInfoEntity: Entity { + /// + /// 用户id + /// + public Guid UserId { get; set; } + + /// + /// 手机号 + /// + public string Phone{ get; set; } + /// + /// 微信openid + /// + public string WeChatOpenId { get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserStoreAggregateRoot.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserStoreAggregateRoot.cs index 0a571cd4..cd81f4e0 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserStoreAggregateRoot.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/CollectiblesUserStoreAggregateRoot.cs @@ -10,5 +10,13 @@ namespace Yi.Framework.DigitalCollectibles.Domain.Entities; [SugarTable("DC_CollectiblesUserStore")] public class CollectiblesUserStoreAggregateRoot:FullAuditedAggregateRoot { - + /// + /// 用户id + /// + public Guid UserId { get; set; } + + /// + /// 藏品id + /// + public Guid CollectiblesId { get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/MarketGoodsAggregateRoot.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/MarketGoodsAggregateRoot.cs index b3b2d96e..35bcfd2e 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/MarketGoodsAggregateRoot.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/MarketGoodsAggregateRoot.cs @@ -10,5 +10,23 @@ namespace Yi.Framework.DigitalCollectibles.Domain.Entities; [SugarTable("DC_MarketGoods")] public class MarketGoodsAggregateRoot:FullAuditedAggregateRoot { + /// + /// 出售者用户id + /// + public Guid SellUserId { get; set; } + + /// + /// 藏品id + /// + public Guid CollectiblesId { get; set; } + /// + /// 出售数量 + /// + public int SellNumber{ get; set; } + + /// + /// 出售单价 + /// + public decimal UnitPrice{ get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/OnHookAggregateRoot.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/OnHookAggregateRoot.cs index ad51b4e7..fd115499 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/OnHookAggregateRoot.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Entities/OnHookAggregateRoot.cs @@ -11,5 +11,28 @@ namespace Yi.Framework.DigitalCollectibles.Domain.Entities; [SugarTable("DC_OnHook")] public class OnHookAggregateRoot:FullAuditedAggregateRoot { + /// + /// 用户id + /// + public Guid UserId { get; set; } + + /// + /// 开始时间 + /// + public DateTime? StarTime { get; set; } + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 有效小时数 + /// + public int EffectiveHours{ get; set; } + + /// + /// 是否激活 + /// + public bool IsActive{ get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/CollectiblesManager.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/CollectiblesManager.cs new file mode 100644 index 00000000..6f7dc729 --- /dev/null +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/CollectiblesManager.cs @@ -0,0 +1,11 @@ +using Volo.Abp.Domain.Services; + +namespace Yi.Framework.DigitalCollectibles.Domain.Managers; +/// +/// 藏品领域服务 +/// 用于管理用户的藏品库存、藏品的业务逻辑 +/// +public class CollectiblesManager:DomainService +{ + +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs index 9a0f8b30..d6cfeea5 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs @@ -8,5 +8,4 @@ namespace Yi.Framework.DigitalCollectibles.Domain.Managers; /// public class MiningPoolManager:DomainService { - } \ No newline at end of file