商户字段

YD_Event.Application/Merchant/Dtos/AddMerchantInput.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using YD_Event.Core.Enum;
 
 namespace YD_Event.Application.Merchant.Dtos;
 
@@ -41,4 +42,14 @@ public class AddMerchantInput
     /// 联系电话
     /// </summary>
     public string? ContactPhone { get; set; }
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    public string? Address { get; set; }
+
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    public AuditStatus? AuditStatus { get; set; }
 }

YD_Event.Application/Merchant/Dtos/MerchantOutput.cs

@@ -0,0 +1,74 @@
+using YD_Event.Core.Enum;
+
+namespace YD_Event.Application.Merchant.Dtos;
+
+/// <summary>
+/// 商户输出DTO
+/// </summary>
+public class MerchantOutput
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 商户名称
+    /// </summary>
+    public string MerchantName { get; set; }
+
+    /// <summary>
+    /// 统一社会信用代码
+    /// </summary>
+    public string CreditCode { get; set; }
+
+    /// <summary>
+    /// 开户行
+    /// </summary>
+    public string BankName { get; set; }
+
+    /// <summary>
+    /// 账号
+    /// </summary>
+    public string AccountNumber { get; set; }
+
+    /// <summary>
+    /// 营业执照图片URL
+    /// </summary>
+    public string BusinessLicenseUrl { get; set; }
+
+    /// <summary>
+    /// 联系电话
+    /// </summary>
+    public string? ContactPhone { get; set; }
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    public string? Address { get; set; }
+
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    public AuditStatus? AuditStatus { get; set; }
+
+    /// <summary>
+    /// 审核备注
+    /// </summary>
+    public string? AuditRemark { get; set; }
+
+    /// <summary>
+    /// 可用状态
+    /// </summary>
+    public AvailabilityStatus Status { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreatedTime { get; set; }
+
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    public DateTime? UpdatedTime { get; set; }
+}

YD_Event.Application/Merchant/MerchantService.cs

@@ -128,16 +128,34 @@ public class MerchantService : BaseService<YD_Event.Core.Entities.Merchant>, ITr
     /// </summary>
     [DisplayName("商户分页查询")]
     [HttpGet("page")]
-    public async Task<PageResult<YD_Event.Core.Entities.Merchant>> Page([FromQuery] MerchantQueryInput input)
+    public async Task<PageResult<MerchantOutput>> Page([FromQuery] MerchantQueryInput input)
     {
-        return await _repository.AsQueryable()
+        var pageResult = await _repository.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.MerchantName), x => x.MerchantName.Contains(input.MerchantName))
             .WhereIF(!string.IsNullOrWhiteSpace(input.ContactPhone), x => x.ContactPhone.Contains(input.ContactPhone))
             .WhereIF(input.AuditStatus.HasValue, x => x.AuditStatus == input.AuditStatus)
             .WhereIF(input.StartTime.HasValue, x => x.CreatedTime >= input.StartTime)
             .WhereIF(input.EndTime.HasValue, x => x.CreatedTime <= input.EndTime)
             .OrderByDescending(x => x.CreatedTime)
+            .Select(x => new MerchantOutput
+            {
+                Id = x.Id,
+                MerchantName = x.MerchantName,
+                CreditCode = x.CreditCode,
+                BankName = x.BankName,
+                AccountNumber = x.AccountNumber,
+                BusinessLicenseUrl = x.BusinessLicenseUrl,
+                ContactPhone = x.ContactPhone,
+                Address = x.Address,
+                AuditStatus = x.AuditStatus,
+                AuditRemark = x.AuditRemark,
+                Status = x.Status,
+                CreatedTime = x.CreatedTime,
+                UpdatedTime = x.UpdatedTime
+            })
             .ToPagedListAsync(input);
+
+        return pageResult;
     }
 
     /// <summary>
@@ -181,11 +199,27 @@ public class MerchantService : BaseService<YD_Event.Core.Entities.Merchant>, ITr
     /// </summary>
     [DisplayName("获取商户详情")]
     [HttpGet("detail")]
-    public async Task<YD_Event.Core.Entities.Merchant> Detail([FromQuery] long id)
+    public async Task<MerchantOutput> Detail([FromQuery] long id)
     {
         var entity = await _repository.GetByIdAsync(id);
         if (entity == null) throw Oops.Bah("商户不存在");
-        return entity;
+
+        return new MerchantOutput
+        {
+            Id = entity.Id,
+            MerchantName = entity.MerchantName,
+            CreditCode = entity.CreditCode,
+            BankName = entity.BankName,
+            AccountNumber = entity.AccountNumber,
+            BusinessLicenseUrl = entity.BusinessLicenseUrl,
+            ContactPhone = entity.ContactPhone,
+            Address = entity.Address,
+            AuditStatus = entity.AuditStatus,
+            AuditRemark = entity.AuditRemark,
+            Status = entity.Status,
+            CreatedTime = entity.CreatedTime,
+            UpdatedTime = entity.UpdatedTime
+        };
     }
 
     /// <summary>

YD_Event.Application/YD_Event.Application.xml

@@ -6036,6 +6036,86 @@
             联系电话
             </summary>
         </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.AddMerchantInput.Address">
+            <summary>
+            地址
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.AddMerchantInput.AuditStatus">
+            <summary>
+            审核状态
+            </summary>
+        </member>
+        <member name="T:YD_Event.Application.Merchant.Dtos.MerchantOutput">
+            <summary>
+            商户输出DTO
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.MerchantName">
+            <summary>
+            商户名称
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.CreditCode">
+            <summary>
+            统一社会信用代码
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.BankName">
+            <summary>
+            开户行
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.AccountNumber">
+            <summary>
+            账号
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.BusinessLicenseUrl">
+            <summary>
+            营业执照图片URL
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.ContactPhone">
+            <summary>
+            联系电话
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.Address">
+            <summary>
+            地址
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.AuditStatus">
+            <summary>
+            审核状态
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.AuditRemark">
+            <summary>
+            审核备注
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.Status">
+            <summary>
+            可用状态
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.CreatedTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Merchant.Dtos.MerchantOutput.UpdatedTime">
+            <summary>
+            更新时间
+            </summary>
+        </member>
         <member name="T:YD_Event.Application.Merchant.Dtos.MerchantQueryInput">
             <summary>
             商户查询输入