diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs index 1c94188..f5eb615 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs @@ -8,7 +8,7 @@ public class SubmitShopBuyOrderResponseDto // public PaymentStatus PaymentStatus { get; set; } // - public DateTime? Created { get; set; } + public DateTime? PaymentDate { get; set; } // public PaymentMethod? PaymentMethod { get; set; } // diff --git a/src/CMSMicroservice.Application/UserWalletCQ/Queries/GetAllUserWalletByFilter/GetAllUserWalletByFilterQuery.cs b/src/CMSMicroservice.Application/UserWalletCQ/Queries/GetAllUserWalletByFilter/GetAllUserWalletByFilterQuery.cs index a8accdf..729a57f 100644 --- a/src/CMSMicroservice.Application/UserWalletCQ/Queries/GetAllUserWalletByFilter/GetAllUserWalletByFilterQuery.cs +++ b/src/CMSMicroservice.Application/UserWalletCQ/Queries/GetAllUserWalletByFilter/GetAllUserWalletByFilterQuery.cs @@ -17,5 +17,5 @@ public record GetAllUserWalletByFilterQuery : IRequest { @@ -13,18 +11,16 @@ public class PruductTagConfiguration : IEntityTypeConfiguration builder.Ignore(entity => entity.DomainEvents); builder.HasKey(entity => entity.Id); builder.Property(entity => entity.Id).UseIdentityColumn(); - builder .HasOne(entity => entity.Product) .WithMany(entity => entity.PruductTags) .HasForeignKey(entity => entity.ProductId) .IsRequired(true); - builder .HasOne(entity => entity.Tag) .WithMany(entity => entity.PruductTags) .HasForeignKey(entity => entity.TagId) .IsRequired(true); + } } - diff --git a/src/CMSMicroservice.Protobuf/Protos/userorder.proto b/src/CMSMicroservice.Protobuf/Protos/userorder.proto index 6049095..b10ea73 100644 --- a/src/CMSMicroservice.Protobuf/Protos/userorder.proto +++ b/src/CMSMicroservice.Protobuf/Protos/userorder.proto @@ -178,7 +178,7 @@ message SubmitShopBuyOrderResponse { messages.PaymentStatus payment_status = 2; } - google.protobuf.Timestamp created = 3; + google.protobuf.Timestamp payment_date = 3; oneof PaymentMethod_item { messages.PaymentMethod payment_method = 4; diff --git a/src/CMSMicroservice.Protobuf/Protos/userwallet.proto b/src/CMSMicroservice.Protobuf/Protos/userwallet.proto index 42defba..1e98a3f 100644 --- a/src/CMSMicroservice.Protobuf/Protos/userwallet.proto +++ b/src/CMSMicroservice.Protobuf/Protos/userwallet.proto @@ -87,7 +87,7 @@ message GetAllUserWalletByFilterFilter google.protobuf.Int64Value id = 1; google.protobuf.Int64Value user_id = 2; google.protobuf.Int64Value balance = 3; - int64 network_balance = 4; + google.protobuf.Int64Value network_balance = 4; } message GetAllUserWalletByFilterResponse { diff --git a/src/CMSMicroservice.Protobuf/Protos/userwalletchangelog.proto b/src/CMSMicroservice.Protobuf/Protos/userwalletchangelog.proto index 405146b..957558e 100644 --- a/src/CMSMicroservice.Protobuf/Protos/userwalletchangelog.proto +++ b/src/CMSMicroservice.Protobuf/Protos/userwalletchangelog.proto @@ -102,6 +102,7 @@ message GetAllUserWalletChangeLogByFilterFilter google.protobuf.Int64Value change_value = 4; google.protobuf.BoolValue is_increase = 5; google.protobuf.Int64Value refrence_id = 6; + google.protobuf.Int64Value user_id = 7; } message GetAllUserWalletChangeLogByFilterResponse {