diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/CommissionDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/CommissionDto.cs index 11e9c55..f17cc92 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/CommissionDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/CommissionDto.cs @@ -20,6 +20,11 @@ public class CommissionDto /// public string? UserNickname { get; set; } + /// + /// 获得佣金的用户UID + /// + public string? UserUid { get; set; } + /// /// 来源用户ID /// @@ -30,6 +35,11 @@ public class CommissionDto /// public string? FromUserNickname { get; set; } + /// + /// 来源用户UID + /// + public string? FromUserUid { get; set; } + /// /// 关联订单ID /// diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/InviteCodeDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/InviteCodeDto.cs index 2b5975a..dadf2ed 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/InviteCodeDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Distribution/InviteCodeDto.cs @@ -30,6 +30,11 @@ public class InviteCodeDto /// public string? AssignUserNickname { get; set; } + /// + /// 分配给的用户UID + /// + public string? AssignUserUid { get; set; } + /// /// 分配时间 /// @@ -45,6 +50,11 @@ public class InviteCodeDto /// public string? UseUserNickname { get; set; } + /// + /// 使用者用户UID + /// + public string? UseUserUid { get; set; } + /// /// 使用的订单ID /// diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/DistributionService.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/DistributionService.cs index 97dde0f..153a1b7 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/DistributionService.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/DistributionService.cs @@ -128,9 +128,11 @@ public class DistributionService : IDistributionService BatchNo = c.BatchNo, AssignUserId = c.AssignUserId, AssignUserNickname = c.AssignUser != null ? c.AssignUser.Nickname : null, + AssignUserUid = c.AssignUser != null ? c.AssignUser.Uid : null, AssignTime = c.AssignTime, UseUserId = c.UseUserId, UseUserNickname = c.UseUser != null ? c.UseUser.Nickname : null, + UseUserUid = c.UseUser != null ? c.UseUser.Uid : null, UseOrderId = c.UseOrderId, UseTime = c.UseTime, Status = c.Status, @@ -264,9 +266,11 @@ public class DistributionService : IDistributionService BatchNo = c.BatchNo, AssignUserId = c.AssignUserId, AssignUserNickname = c.AssignUser != null ? c.AssignUser.Nickname : null, + AssignUserUid = c.AssignUser != null ? c.AssignUser.Uid : null, AssignTime = c.AssignTime, UseUserId = c.UseUserId, UseUserNickname = c.UseUser != null ? c.UseUser.Nickname : null, + UseUserUid = c.UseUser != null ? c.UseUser.Uid : null, UseOrderId = c.UseOrderId, UseTime = c.UseTime, Status = c.Status, @@ -311,8 +315,10 @@ public class DistributionService : IDistributionService Id = c.Id, UserId = c.UserId, UserNickname = c.User != null ? c.User.Nickname : null, + UserUid = c.User != null ? c.User.Uid : null, FromUserId = c.FromUserId, FromUserNickname = c.FromUser != null ? c.FromUser.Nickname : null, + FromUserUid = c.FromUser != null ? c.FromUser.Uid : null, OrderId = c.OrderId, OrderNo = c.Order != null ? c.Order.OrderNo : null, OrderAmount = c.OrderAmount, @@ -434,8 +440,10 @@ public class DistributionService : IDistributionService Id = c.Id, UserId = c.UserId, UserNickname = c.User != null ? c.User.Nickname : null, + UserUid = c.User != null ? c.User.Uid : null, FromUserId = c.FromUserId, FromUserNickname = c.FromUser != null ? c.FromUser.Nickname : null, + FromUserUid = c.FromUser != null ? c.FromUser.Uid : null, OrderId = c.OrderId, OrderNo = c.Order != null ? c.Order.OrderNo : null, OrderAmount = c.OrderAmount, diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/distribution/commission/index.vue b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/distribution/commission/index.vue index 569ed84..dd57d5e 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/distribution/commission/index.vue +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/distribution/commission/index.vue @@ -68,13 +68,13 @@ @@ -84,7 +84,7 @@ - +