feat 添加售后单后台接口

ARW.Model/Dto/Api/OrderManage/OrderRefunds/AddOrderRefundApiDto.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ARW.Model.Models.Business.OrderManage.OrderRefunds;
+
+namespace ARW.Model.Dto.Api.OrderManage.OrderRefunds
+{
+
+    /// <summary>
+    /// 售后单记录表对象Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public class AddOrderRefundApiDto
+    {
+        public int OrderRefundId { get; set; }
+
+        public long OrderRefundGuid { get; set; }
+
+        [Required(ErrorMessage = "订单guid不能为空")]
+        public long OrderGuid { get; set; }
+
+        public long CustomerGuid { get; set; }
+
+        [Required(ErrorMessage = "售后类型(1退货退款 2退货(无需退款) 3换货)不能为空")]
+        public int RefundType { get; set; }
+
+        [Required(ErrorMessage = "商品收货状态(1未收到货 2已收到货)不能为空")]
+        public int GoodsReceiveStatus { get; set; }
+
+        public int RefundReason { get; set; }
+
+        [Required(ErrorMessage = "退款金额")]
+        public decimal RefundMoney { get; set; }
+
+        public string CustomerRefundDesc { get; set; }
+
+        public string CustomerRefundImg { get; set; }
+
+    }
+
+	
+}

ARW.Model/Dto/Api/OrderManage/OrderRefunds/OrderRefundApiDto.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ARW.Model.Models.Business.OrderManage.OrderRefunds;
+
+namespace ARW.Model.Dto.Api.OrderManage.OrderRefunds
+{
+
+    /// <summary>
+    /// 售后单记录表查询对象Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public class OrderRefundQueryDtoApi : PagerInfo 
+    {
+        public int? RefundType { get; set; }
+        public int? RefundReason { get; set; }
+        public int? GoodsReceiveStatus { get; set; }
+        public int? MerchantAuditStatus { get; set; }
+        public int? IsCustomerSend { get; set; }
+        public int? OrderRefundStatus { get; set; }
+    }
+	
+	
+    /// <summary>
+    /// 售后单记录表详情输入对象Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public class OrderRefundDtoApi
+    {
+        [Required(ErrorMessage = "OrderRefundGuid不能为空")]
+        public long OrderRefundGuid { get; set; }
+    }
+	
+}

ARW.Model/Dto/Business/OrderManage/OrderRefunds/OrderRefundDetailsDto.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ARW.Model.Models.Business.OrderManage.OrderRefunds;
+
+namespace ARW.Model.Dto.Business.OrderManage.OrderRefunds
+{
+    /// <summary>
+    /// 售后单详情记录表输入对象
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public class OrderRefundDetailsDto
+    {
+        public int OrderRefundId { get; set; }
+        public long OrderRefundGuid { get; set; }
+    }
+
+}

ARW.Model/Dto/Business/OrderManage/OrderRefunds/OrderRefundDto.cs

@@ -88,6 +88,10 @@ namespace ARW.Model.Dto.Business.OrderManage.OrderRefunds
         public int? OrderRefundStatus { get; set; }
     
         public string ids { get; set; }
+
+        public DateTime BeginTime { get; set; }
+
+        public DateTime EndTime { get; set; }
     }
 
 

ARW.Model/Models/Business/OrderManage/OrderRefunds/OrderRefund.cs

@@ -118,13 +118,21 @@ namespace ARW.Model.Models.Business.OrderManage.OrderRefunds
         public string MerchantRefuseDesc { get; set; }
 
 
+        /// <summary>
+        /// 描述 :退款金额 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "退款金额")]
+        [SugarColumn(ColumnName = "refund_money")]
+        public decimal RefundMoney { get; set; }
+
         /// <summary>
         /// 描述 :实际退款金额 
         /// 空值 : false  
         /// </summary>
         [EpplusTableColumn(Header = "实际退款金额")]
-        [SugarColumn(ColumnName = "refund_money")]
+        [SugarColumn(ColumnName = "refund_actual_money")]
-        public decimal RefundMoney { get; set; }
+        public decimal RefundActualMoney { get; set; }
 
 
         /// <summary>
@@ -155,6 +163,23 @@ namespace ARW.Model.Models.Business.OrderManage.OrderRefunds
         public DateTime? CustomerSendTime { get; set; }
 
 
+        /// <summary>
+        /// 描述 :商家是否收货(1未收货 2已收货) 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "商家是否收货(1未收货 2已收货)")]
+        [SugarColumn(ColumnName = "is_merchant_receive")]
+        public int IsMerchantReceive { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商家收货时间 
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "商家收货时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        [SugarColumn(ColumnName = "merchant_receive_time")]
+        public DateTime? MerchantReceiveTime { get; set; }
+
         /// <summary>
         /// 描述 :客户发货物流公司guid 
         /// 空值 : true  

ARW.Model/Vo/Api/OrderManage/OrderRefunds/OrderRefundApiVo.cs

@@ -0,0 +1,200 @@
+using Newtonsoft.Json;
+using OfficeOpenXml.Attributes;
+using SqlSugar;
+using System;
+
+namespace ARW.Model.Vo.Api.OrderManage.OrderRefunds
+{
+    /// <summary>
+    /// 售后单记录表展示对象Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public class OrderRefundVoApi
+    {
+
+
+        /// <summary>
+        /// 描述 : 
+        /// </summary>
+		[EpplusIgnore]
+        public int OrderRefundId { get; set; }
+
+
+        /// <summary>
+        /// 描述 : 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long OrderRefundGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :订单guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+        [EpplusTableColumn(Header = "订单guid")]
+        public long OrderGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+        [EpplusTableColumn(Header = "客户guid")]
+        public long CustomerGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :售后类型(1退货退款 2退货(无需退款) 3换货) 
+        /// </summary>
+        [EpplusTableColumn(Header = "售后类型(1退货退款 2退货(无需退款) 3换货)")]
+        public int RefundType { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户退货原因 
+        /// </summary>
+        [EpplusTableColumn(Header = "客户退货原因")]
+        public int RefundReason { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户退款说明 
+        /// </summary>
+		[EpplusIgnore]
+        public string CustomerRefundDesc { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户退款凭证 
+        /// </summary>
+		[EpplusIgnore]
+        public string CustomerRefundImg { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商品收货状态(1未收到货 2已收到货) 
+        /// </summary>
+        [EpplusTableColumn(Header = "商品收货状态(1未收到货 2已收到货)")]
+        public int GoodsReceiveStatus { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商家审核状态(1待审核 2已同意 3已拒绝) 
+        /// </summary>
+        [EpplusTableColumn(Header = "商家审核状态(1待审核 2已同意 3已拒绝)")]
+        public int MerchantAuditStatus { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商家拒绝原因(说明) 
+        /// </summary>
+		[EpplusIgnore]
+        public string MerchantRefuseDesc { get; set; }
+
+
+        /// <summary>
+        /// 描述 :实际退款金额 
+        /// </summary>
+        [EpplusTableColumn(Header = "实际退款金额")]
+        public decimal RefundMoney { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商家退货地址guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long? ShopRefundAddressGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :用户是否发货(1未发货 2已发货) 
+        /// </summary>
+        [EpplusTableColumn(Header = "用户是否发货(1未发货 2已发货)")]
+        public int IsCustomerSend { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户发货时间 
+        /// </summary>
+		[EpplusIgnore]
+        public DateTime? CustomerSendTime { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户发货物流公司guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long? LogisticsCompanyGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户发货物流单号 
+        /// </summary>
+		[EpplusIgnore]
+        public string ExpressNo { get; set; }
+
+
+        /// <summary>
+        /// 描述 :售后单状态(1进行中 2已拒绝 3已完成 4已取消) 
+        /// </summary>
+        [EpplusTableColumn(Header = "售后单状态(1进行中 2已拒绝 3已完成 4已取消)")]
+        public int OrderRefundStatus { get; set; }
+
+    }
+	
+	
+	/// <summary>
+    /// 售后单记录表详情展示对象Api
+    /// </summary>
+    public class OrderRefundApiDetailsVo
+    {
+		[EpplusIgnore]
+        public int OrderRefundId { get; set; }
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long OrderRefundGuid { get; set; }
+		[JsonConverter(typeof(ValueToStringConverter))]
+        [EpplusTableColumn(Header = "订单guid")]
+        public long OrderGuid { get; set; }
+		[JsonConverter(typeof(ValueToStringConverter))]
+        [EpplusTableColumn(Header = "客户guid")]
+        public long CustomerGuid { get; set; }
+        [EpplusTableColumn(Header = "售后类型(1退货退款 2退货(无需退款) 3换货)")]
+        public int RefundType { get; set; }
+        [EpplusTableColumn(Header = "客户退货原因")]
+        public int RefundReason { get; set; }
+		[EpplusIgnore]
+        public string CustomerRefundDesc { get; set; }
+		[EpplusIgnore]
+        public string CustomerRefundImg { get; set; }
+        [EpplusTableColumn(Header = "商品收货状态(1未收到货 2已收到货)")]
+        public int GoodsReceiveStatus { get; set; }
+        [EpplusTableColumn(Header = "商家审核状态(1待审核 2已同意 3已拒绝)")]
+        public int MerchantAuditStatus { get; set; }
+		[EpplusIgnore]
+        public string MerchantRefuseDesc { get; set; }
+        [EpplusTableColumn(Header = "实际退款金额")]
+        public decimal RefundMoney { get; set; }
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long? ShopRefundAddressGuid { get; set; }
+        [EpplusTableColumn(Header = "用户是否发货(1未发货 2已发货)")]
+        public int IsCustomerSend { get; set; }
+		[EpplusIgnore]
+        public DateTime? CustomerSendTime { get; set; }
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long? LogisticsCompanyGuid { get; set; }
+		[EpplusIgnore]
+        public string ExpressNo { get; set; }
+        [EpplusTableColumn(Header = "售后单状态(1进行中 2已拒绝 3已完成 4已取消)")]
+        public int OrderRefundStatus { get; set; }
+
+    }
+	
+}

ARW.Model/Vo/Business/OrderManage/OrderRefunds/OrderRefundDetailVo.cs

@@ -0,0 +1,176 @@
+using ARW.Model.Vo.Business.LogisticsManage.Deliverys;
+using ARW.Model.Vo.Business.OrderManage.Orders;
+using Newtonsoft.Json;
+using OfficeOpenXml.Attributes;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+
+namespace ARW.Model.Vo.Business.OrderManage.OrderRefunds
+{
+    /// <summary>
+    /// 售后单记录表详情展示对象
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public class OrderRefundDetailVo
+    {
+
+
+        /// <summary>
+        /// 描述 : 
+        /// </summary>
+		[EpplusIgnore]
+        public int OrderRefundId { get; set; }
+
+
+        /// <summary>
+        /// 描述 : 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long OrderRefundGuid { get; set; }
+
+        /// <summary>
+        /// 描述 :订单guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+        public long OrderGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :订单号 
+        /// </summary>
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public string OrderNumber { get; set; }
+
+
+        /// <summary>
+        /// 商品信息
+        /// </summary>
+        public List<OrderGoodsVo> GoodsInfoList { get; set; }
+
+   
+        /// <summary>
+        /// 客户手机号
+        /// </summary>
+        public string CustomerPhone { get; set; }
+
+       
+        /// <summary>
+        /// 描述 :售后类型(1退货退款 2退货(无需退款) 3换货) 
+        /// </summary>
+        [EpplusTableColumn(Header = "售后类型(1退货退款 2退货(无需退款) 3换货)")]
+        public int RefundType { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户退货原因 
+        /// </summary>
+        [EpplusTableColumn(Header = "客户退货原因")]
+        public int RefundReason { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户退款说明 
+        /// </summary>
+		[EpplusIgnore]
+        public string CustomerRefundDesc { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户退款凭证 
+        /// </summary>
+		[EpplusIgnore]
+        public string CustomerRefundImg { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商品收货状态(1未收到货 2已收到货) 
+        /// </summary>
+        [EpplusTableColumn(Header = "商品收货状态(1未收到货 2已收到货)")]
+        public int GoodsReceiveStatus { get; set; }
+
+
+        public int IsMerchantReceive { get; set; }
+
+        /// <summary>
+        /// 描述 :商家审核状态(1待审核 2已同意 3已拒绝) 
+        /// </summary>
+        [EpplusTableColumn(Header = "商家审核状态(1待审核 2已同意 3已拒绝)")]
+        public int MerchantAuditStatus { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商家拒绝原因(说明) 
+        /// </summary>
+		[EpplusIgnore]
+        public string MerchantRefuseDesc { get; set; }
+
+
+        /// <summary>
+        /// 描述 :实际退款金额 
+        /// </summary>
+        [EpplusTableColumn(Header = "实际退款金额")]
+        public decimal RefundMoney { get; set; }
+
+
+        /// <summary>
+        /// 描述 :商家退货地址guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long? ShopRefundAddressGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :用户是否发货(1未发货 2已发货) 
+        /// </summary>
+        [EpplusTableColumn(Header = "用户是否发货(1未发货 2已发货)")]
+        public int IsCustomerSend { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户发货时间 
+        /// </summary>
+		[EpplusIgnore]
+        public DateTime? CustomerSendTime { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户发货物流公司guid 
+        /// </summary>
+		[JsonConverter(typeof(ValueToStringConverter))]
+		[EpplusIgnore]
+        public long? LogisticsCompanyGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :客户发货物流单号 
+        /// </summary>
+		[EpplusIgnore]
+        public string ExpressNo { get; set; }
+
+
+        /// <summary>
+        /// 描述 :售后单状态(1进行中 2已拒绝 3已完成 4已取消) 
+        /// </summary>
+        [EpplusTableColumn(Header = "售后单状态(1进行中 2已拒绝 3已完成 4已取消)")]
+        public int OrderRefundStatus { get; set; }
+
+
+        public string CreateTime { get; set; }
+
+
+        /// <summary>
+        /// 描述 :物流公司 
+        /// </summary>
+        public string LogisticsCompany { get; set; }
+
+        /// <summary>
+        /// 收货信息
+        /// </summary>
+        public OrderReceiveVo OrderReceive { get; set; }
+    }
+}

ARW.Model/Vo/Business/OrderManage/OrderRefunds/OrderRefundVo.cs

@@ -1,7 +1,9 @@
+using ARW.Model.Vo.Business.OrderManage.Orders;
 using Newtonsoft.Json;
 using OfficeOpenXml.Attributes;
 using SqlSugar;
 using System;
+using System.Collections.Generic;
 
 namespace ARW.Model.Vo.Business.OrderManage.OrderRefunds
 {
@@ -38,6 +40,20 @@ namespace ARW.Model.Vo.Business.OrderManage.OrderRefunds
         public long OrderGuid { get; set; }
 
 
+        /// <summary>
+        /// 描述 :订单号 
+        /// </summary>
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [EpplusTableColumn(Header = "订单号")]
+        public string OrderNumber { get; set; }
+
+
+        /// <summary>
+        /// 商品信息
+        /// </summary>
+        public List<OrderGoodsVo> GoodsInfoList { get; set; }
+
+
         /// <summary>
         /// 描述 :客户guid 
         /// </summary>
@@ -45,6 +61,21 @@ namespace ARW.Model.Vo.Business.OrderManage.OrderRefunds
         [EpplusTableColumn(Header = "客户guid")]
         public long CustomerGuid { get; set; }
 
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string CustomerNickName { get; set; }
+
+        /// <summary>
+        /// 客户手机号
+        /// </summary>
+        public string CustomerMobilePhoneNumber { get; set; }
+
+        /// <summary>
+        /// 客户头像
+        /// </summary>
+        public string CustomerAvatar { get; set; }
+
 
         /// <summary>
         /// 描述 :售后类型(1退货退款 2退货(无需退款) 3换货) 
@@ -81,6 +112,9 @@ namespace ARW.Model.Vo.Business.OrderManage.OrderRefunds
         public int GoodsReceiveStatus { get; set; }
 
 
+        public int IsMerchantReceive { get; set; }
+
+
         /// <summary>
         /// 描述 :商家审核状态(1待审核 2已同意 3已拒绝) 
         /// </summary>
@@ -145,5 +179,8 @@ namespace ARW.Model.Vo.Business.OrderManage.OrderRefunds
         [EpplusTableColumn(Header = "售后单状态(1进行中 2已拒绝 3已完成 4已取消)")]
         public int OrderRefundStatus { get; set; }
 
+
+        public string CreateTime { get; set; }
+
     }
 }

ARW.Service/Api/BusinessService/OrderManage/OrderRefunds/OrderRefundServiceApi.cs

@@ -0,0 +1,144 @@
+using Infrastructure.Attribute;
+using Microsoft.AspNetCore.Http;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ARW.Model;
+using ARW.Repository;
+using ARW.Repository.Business.OrderManage.OrderRefunds;
+using ARW.Service.Api.IBusinessService.OrderManage.OrderRefunds;
+using ARW.Model.Dto.Api.OrderManage.OrderRefunds;
+using ARW.Model.Models.Business.OrderManage.OrderRefunds;
+using ARW.Model.Vo.Api.OrderManage.OrderRefunds;
+
+namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
+{
+    /// <summary>
+    /// 售后单记录表接口实现类Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    [AppService(ServiceType = typeof(IOrderRefundServiceApi), ServiceLifetime = LifeTime.Transient)]
+    public class OrderRefundServiceImplApi : BaseService<OrderRefund>, IOrderRefundServiceApi
+    {
+        private readonly OrderRefundRepository _OrderRefundRepository;
+
+        public OrderRefundServiceImplApi(OrderRefundRepository OrderRefundRepository)
+        {
+            this._OrderRefundRepository = OrderRefundRepository;
+        }
+
+        #region Api接口代码
+
+
+        /// <summary>
+        /// 查询售后单记录表列表(Api)
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public async Task<PagedInfo<OrderRefundVoApi>> GetOrderRefundListApi(OrderRefundQueryDtoApi parm)
+        {
+            //开始拼装查询条件d
+            var predicate = Expressionable.Create<OrderRefund>();
+
+            predicate = predicate.AndIF(parm.RefundType != null, s => s.RefundType == parm.RefundType);
+            predicate = predicate.AndIF(parm.RefundReason != null, s => s.RefundReason == parm.RefundReason);
+            predicate = predicate.AndIF(parm.GoodsReceiveStatus != null, s => s.GoodsReceiveStatus == parm.GoodsReceiveStatus);
+            predicate = predicate.AndIF(parm.MerchantAuditStatus != null, s => s.MerchantAuditStatus == parm.MerchantAuditStatus);
+            predicate = predicate.AndIF(parm.IsCustomerSend != null, s => s.IsCustomerSend == parm.IsCustomerSend);
+            predicate = predicate.AndIF(parm.OrderRefundStatus != null, s => s.OrderRefundStatus == parm.OrderRefundStatus);
+            var query = _OrderRefundRepository
+                .Queryable()
+                .Where(predicate.ToExpression())
+                .OrderBy(s => s.Create_time, OrderByType.Desc)
+                .Select(s => new OrderRefundVoApi
+                {
+                    OrderRefundId = s.OrderRefundId,
+                    OrderRefundGuid = s.OrderRefundGuid,
+                    OrderGuid = s.OrderGuid,
+                    CustomerGuid = s.CustomerGuid,
+                    RefundType = s.RefundType,
+                    RefundReason = s.RefundReason,
+                    CustomerRefundDesc = s.CustomerRefundDesc,
+                    CustomerRefundImg = s.CustomerRefundImg,
+                    GoodsReceiveStatus = s.GoodsReceiveStatus,
+                    MerchantAuditStatus = s.MerchantAuditStatus,
+                    MerchantRefuseDesc = s.MerchantRefuseDesc,
+                    RefundMoney = s.RefundMoney,
+                    ShopRefundAddressGuid = s.ShopRefundAddressGuid,
+                    IsCustomerSend = s.IsCustomerSend,
+                    CustomerSendTime = s.CustomerSendTime,
+                    LogisticsCompanyGuid = s.LogisticsCompanyGuid,
+                    ExpressNo = s.ExpressNo,
+                    OrderRefundStatus = s.OrderRefundStatus,
+                });
+
+
+            return await query.ToPageAsync(parm);
+        }
+
+
+
+        /// <summary>
+        ///  添加售后单记录表
+        /// </summary>
+        public async Task<string> AddOrderRefund(OrderRefund model)
+        {
+            model.GoodsReceiveStatus = 1;
+            model.MerchantAuditStatus = 1;
+            model.IsCustomerSend = 1;
+            model.OrderRefundStatus = 1;
+            model.IsMerchantReceive = 1;
+
+            var response = await _OrderRefundRepository.InsertReturnSnowflakeIdAsync(model);
+            return "添加成功！";
+        }
+
+
+
+        /// <summary>
+        /// 查询售后单记录表详情(Api)
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public async Task<string> GetOrderRefundDetails(OrderRefundDtoApi parm)
+        {
+
+            var query = _OrderRefundRepository
+                .Queryable()
+                .Where(s => s.OrderRefundGuid == parm.OrderRefundGuid)
+                .Select(s => new OrderRefundApiDetailsVo
+                {
+                    OrderRefundId = s.OrderRefundId,
+                    OrderRefundGuid = s.OrderRefundGuid,
+                    OrderGuid = s.OrderGuid,
+                    CustomerGuid = s.CustomerGuid,
+                    RefundType = s.RefundType,
+                    RefundReason = s.RefundReason,
+                    CustomerRefundDesc = s.CustomerRefundDesc,
+                    CustomerRefundImg = s.CustomerRefundImg,
+                    GoodsReceiveStatus = s.GoodsReceiveStatus,
+                    MerchantAuditStatus = s.MerchantAuditStatus,
+                    MerchantRefuseDesc = s.MerchantRefuseDesc,
+                    RefundMoney = s.RefundMoney,
+                    ShopRefundAddressGuid = s.ShopRefundAddressGuid,
+                    IsCustomerSend = s.IsCustomerSend,
+                    CustomerSendTime = s.CustomerSendTime,
+                    LogisticsCompanyGuid = s.LogisticsCompanyGuid,
+                    ExpressNo = s.ExpressNo,
+                    OrderRefundStatus = s.OrderRefundStatus,
+                }).Take(1);
+
+
+            return await query.ToJsonAsync();
+        }
+
+
+        #endregion
+
+    }
+}

ARW.Service/Api/IBusinessService/OrderManage/OrderRefunds/IOrderRefundServiceApi.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ARW.Model;
+using ARW.Model.Dto.Api.OrderManage.OrderRefunds;
+using ARW.Model.Models.Business.OrderManage.OrderRefunds;
+using ARW.Model.Vo.Api.OrderManage.OrderRefunds;
+
+namespace ARW.Service.Api.IBusinessService.OrderManage.OrderRefunds
+{
+    /// <summary>
+    /// 售后单记录表接口类Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    public interface IOrderRefundServiceApi : IBaseService<OrderRefund>
+    {
+		/// <summary>
+        /// 获取售后单记录表分页列表(Api)
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        Task<PagedInfo<OrderRefundVoApi>> GetOrderRefundListApi(OrderRefundQueryDtoApi parm);
+
+
+        /// <summary>
+        /// 添加售后单记录表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        Task<string> AddOrderRefund(OrderRefund parm);
+
+
+        /// <summary>
+        /// 获取售后单记录表详情(Api)
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        Task<string> GetOrderRefundDetails(OrderRefundDtoApi parm);
+
+    }
+}

ARW.Service/Business/BusinessService/OrderManage/OrderRefunds/OrderRefundService.cs

@@ -14,6 +14,20 @@ using ARW.Service.Business.IBusinessService.OrderManage.OrderRefunds;
 using ARW.Model.Dto.Business.OrderManage.OrderRefunds;
 using ARW.Model.Models.Business.OrderManage.OrderRefunds;
 using ARW.Model.Vo.Business.OrderManage.OrderRefunds;
+using ARW.Model.Models.Business.Custom.Customers;
+using ARW.Service.Business.IBusinessService.GoodsManager.GoodsSpecs.GoodsSkus;
+using ARW.Service.Business.IBusinessService.OrderManage.Orders;
+using ARW.Model.Models.Business.OrderManage.Orders;
+using ARW.Model.Dto.Api.OrderManage.OrderRefunds;
+using ARW.Model.Vo.Api.OrderManage.OrderRefunds;
+using ARW.Common;
+using ARW.Model.Vo.Business.OrderManage.Orders;
+using Senparc.CO2NET.Extensions;
+using ARW.Model.Models.Business.LogisticsManage.LogisticsCompanys;
+using ARW.Model.Models.Business.ShopManager.ShopAddresss;
+using ARW.Repository.Business.ShopManager.ShopAddresss;
+using ARW.Service.Business.IBusinessService.Custom.Regions;
+using ARW.Repository.Business.LogisticsManage.LogisticsCompanys;
 
 namespace ARW.Service.Business.BusinessService.OrderManage.OrderRefunds
 {
@@ -27,10 +41,18 @@ namespace ARW.Service.Business.BusinessService.OrderManage.OrderRefunds
     public class OrderRefundServiceImpl : BaseService<OrderRefund>, IOrderRefundService
     {
         private readonly OrderRefundRepository _OrderRefundRepository;
+        private readonly ShopAddressRepository _ShopAddressRepository;
+        private readonly LogisticsCompanyRepository _LogisticsCompanyRepository;
+        private readonly IOrderService _OrderService;
+        private readonly IRegionService _RegionService;
 
-        public OrderRefundServiceImpl(OrderRefundRepository OrderRefundRepository)
+
+        public OrderRefundServiceImpl(OrderRefundRepository OrderRefundRepository, IOrderService orderService, ShopAddressRepository shopAddressRepository, IRegionService regionService)
         {
             this._OrderRefundRepository = OrderRefundRepository;
+            _OrderService = orderService;
+            _ShopAddressRepository = shopAddressRepository;
+            _RegionService = regionService;
         }
 
         #region 业务逻辑代码
@@ -50,16 +72,24 @@ namespace ARW.Service.Business.BusinessService.OrderManage.OrderRefunds
             predicate = predicate.AndIF(parm.MerchantAuditStatus != null, s => s.MerchantAuditStatus == parm.MerchantAuditStatus);
             predicate = predicate.AndIF(parm.IsCustomerSend != null, s => s.IsCustomerSend == parm.IsCustomerSend);
             predicate = predicate.AndIF(parm.OrderRefundStatus != null, s => s.OrderRefundStatus == parm.OrderRefundStatus);
+            predicate = predicate.AndIF(parm.BeginTime != DateTime.MinValue, s => s.Create_time >= parm.BeginTime);
+            predicate = predicate.AndIF(parm.EndTime != DateTime.MinValue, s => s.Create_time <= parm.EndTime);
             var query = _OrderRefundRepository
                 .Queryable()
+                .LeftJoin<Customer>((s, c) => s.CustomerGuid == c.CustomerGuid)
+                .LeftJoin<Order>((s, c, d) => s.OrderGuid == d.OrderGuid)
                 .Where(predicate.ToExpression())
-                .OrderBy(s => s.Create_time,OrderByType.Desc)
+                .OrderBy(s => s.Create_time, OrderByType.Desc)
-                .Select(s => new OrderRefundVo
+                .Select((s, c, d) => new OrderRefundVo
                 {
                     OrderRefundId = s.OrderRefundId,
                     OrderRefundGuid = s.OrderRefundGuid,
                     OrderGuid = s.OrderGuid,
+                    OrderNumber = d.OrderNumber,
                     CustomerGuid = s.CustomerGuid,
+                    CustomerNickName = c.CustomerNickname,
+                    CustomerMobilePhoneNumber = c.CustomerMobilePhoneNumber,
+                    CustomerAvatar = c.CustomerAvatar,
                     RefundType = s.RefundType,
                     RefundReason = s.RefundReason,
                     CustomerRefundDesc = s.CustomerRefundDesc,
@@ -74,12 +104,84 @@ namespace ARW.Service.Business.BusinessService.OrderManage.OrderRefunds
                     LogisticsCompanyGuid = s.LogisticsCompanyGuid,
                     ExpressNo = s.ExpressNo,
                     OrderRefundStatus = s.OrderRefundStatus,
+                    IsMerchantReceive = s.IsMerchantReceive,
+                    CreateTime = s.Create_time.ToString("yyyy:HH:dd mm:ss")
                 });
 
 
-		return await query.ToPageAsync(parm);
+            var list = await query.ToPageAsync(parm);
+
+            foreach (var item in list.Result)
+            {
+                // 获取订单商品信息
+                item.GoodsInfoList = await _OrderService.GetOrderGoodsList(item.OrderGuid);
+
             }
 
+            return list;
+        }
+
+
+
+        /// <summary>
+        /// 查询售后单记录表详情
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public async Task<string> GetOrderRefundDetails(OrderRefundDetailsDto parm)
+        {
+
+            var query = _OrderRefundRepository
+                .Queryable()
+                .LeftJoin<Customer>((s, c) => s.CustomerGuid == c.CustomerGuid)
+                .LeftJoin<Order>((s, c, d) => s.OrderGuid == d.OrderGuid)
+                .Where(s => s.OrderRefundId == parm.OrderRefundId)
+                .Select((s, c, d) => new OrderRefundDetailVo
+                {
+                    OrderRefundId = s.OrderRefundId,
+                    OrderRefundGuid = s.OrderRefundGuid,
+                    OrderGuid = s.OrderGuid,
+                    OrderNumber = d.OrderNumber,
+                    CustomerPhone = c.CustomerMobilePhoneNumber,
+                    RefundType = s.RefundType,
+                    RefundReason = s.RefundReason,
+                    CustomerRefundDesc = s.CustomerRefundDesc,
+                    CustomerRefundImg = s.CustomerRefundImg,
+                    GoodsReceiveStatus = s.GoodsReceiveStatus,
+                    MerchantAuditStatus = s.MerchantAuditStatus,
+                    MerchantRefuseDesc = s.MerchantRefuseDesc,
+                    RefundMoney = s.RefundMoney,
+                    ShopRefundAddressGuid = s.ShopRefundAddressGuid,
+                    IsCustomerSend = s.IsCustomerSend,
+                    CustomerSendTime = s.CustomerSendTime,
+                    LogisticsCompanyGuid = s.LogisticsCompanyGuid,
+                    ExpressNo = s.ExpressNo,
+                    OrderRefundStatus = s.OrderRefundStatus,
+                    IsMerchantReceive = s.IsMerchantReceive,
+                    CreateTime = s.Create_time.ToString("yyyy:HH:dd mm:ss")
+                }).Take(1);
+
+
+            var json = await query.ToJsonAsync();
+            if (json != "[]")
+            {
+                var data = Tools.JsonToVo<OrderRefundDetailVo>(json);
+                data.GoodsInfoList = await _OrderService.GetOrderGoodsList(data.OrderGuid);
+                data.OrderReceive = await GetOrderReceive(data.ShopRefundAddressGuid);
+                if(data.LogisticsCompanyGuid != null)
+                {
+                    var company = await _LogisticsCompanyRepository.GetFirstAsync(s => s.LogisticsCompanyGuid == data.LogisticsCompanyGuid);
+                    data.LogisticsCompany = company.LogisticsCompanyName;
+                }
+
+                json = data.ToJson();
+            }
+
+            return json;
+        }
+
+
+
         /// <summary>
         ///  添加或修改售后单记录表
         /// </summary>
@@ -113,7 +215,30 @@ namespace ARW.Service.Business.BusinessService.OrderManage.OrderRefunds
 
 
 
-#endregion
+        /// <summary>
+        /// 获取商家收货地址
+        /// </summary>
+        /// <param name="shopAddressGuid">商家退货地址guid</param>
+        /// <returns></returns>
+        public async Task<OrderReceiveVo> GetOrderReceive(long? shopAddressGuid)
+        {
+            var orderReceive = new OrderReceiveVo();
+            var shopAddress = await _ShopAddressRepository.GetFirstAsync(s => s.ShopAddressGuid == shopAddressGuid);
+
+            if (shopAddress != null)
+            {
+                orderReceive.ConsigneeName = shopAddress.ShopAddressContactName;
+                orderReceive.Phone = shopAddress.ShopAddressContactNumber;
+                orderReceive.Detail = shopAddress.ShopAddressDetailedAddress;
+
+                // 获取地区名称
+                orderReceive.Region = await _RegionService.GetRegionFullName(shopAddress.ProvinceId, shopAddress.CityId, shopAddress.DistrictId);
+            }
+
+            return orderReceive;
+        }
+
+        #endregion
 
     }
 }

ARW.Service/Business/IBusinessService/OrderManage/OrderRefunds/IOrderRefundService.cs

@@ -26,6 +26,14 @@ namespace ARW.Service.Business.IBusinessService.OrderManage.OrderRefunds
         Task<PagedInfo<OrderRefundVo>> GetOrderRefundList(OrderRefundQueryDto parm);
 
 
+        /// <summary>
+        /// 获取售后单详情
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        Task<string> GetOrderRefundDetails(OrderRefundDetailsDto parm);
+
+
         /// <summary>
         /// 添加或修改售后单记录表
         /// </summary>

ARW.Service/Business/IBusinessService/OrderManage/Orders/IOrderService.cs

@@ -73,5 +73,14 @@ namespace ARW.Service.Business.IBusinessService.OrderManage.Orders
         Task<List<OrderVo>> HandleExportData(List<OrderVo> data);
 
 
+        /// <summary>
+        /// 获取商品订单列表
+        /// </summary>
+        /// <param name="orderGuid"></param>
+        /// <returns></returns>
+        Task<List<OrderGoodsVo>> GetOrderGoodsList(long orderGuid);
+
+
+
     }
 }

ARW.WebApi/Controllers/Api/OrderManage/OrderRefunds/OrderRefundApiController.cs

@@ -0,0 +1,103 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using ARW.Admin.WebApi.Extensions;
+using ARW.Admin.WebApi.Filters;
+using ARW.Common;
+using ARW.Admin.WebApi.Controllers;
+using ARW.Model.Dto.Api.OrderManage.OrderRefunds;
+using ARW.Service.Api.IBusinessService.OrderManage.OrderRefunds;
+using ARW.Model.Models.Business.OrderManage.OrderRefunds;
+using ARW.Model.Vo.Api.OrderManage.OrderRefunds;
+using Microsoft.AspNetCore.Authorization;
+using Geocoding;
+using ARW.Model.Dto.Business.OrderManage.OrderRefunds;
+using ARW.Service.Business.IBusinessService.OrderManage.OrderRefunds;
+using ARW.Admin.WebApi.Framework;
+
+namespace ARW.WebApi.Controllers.Api.OrderManage.OrderRefunds
+{
+    /// <summary>
+    /// 售后单记录表控制器Api
+    ///
+    /// @author lwh
+    /// @date 2023-10-16
+    /// </summary>
+    [Verify]
+    [Route("api/[controller]")]
+    public class OrderRefundApiController : BaseController
+    {
+        private readonly IOrderRefundServiceApi _OrderRefundServiceApi;
+
+        /// <summary>
+        /// 依赖注入
+        /// </summary>
+        /// <param name="OrderRefundServiceApi">售后单记录表售后单记录表Api服务</param>
+        public OrderRefundApiController(IOrderRefundServiceApi OrderRefundServiceApi)
+        {
+            _OrderRefundServiceApi = OrderRefundServiceApi;
+        }
+
+
+        /// <summary>
+        /// 获取售后单记录表列表(Api)
+        /// </summary>
+        /// <param name="parm">查询参数</param>
+        /// <returns></returns>
+        [HttpGet("getOrderRefundList")]
+        public async Task<IActionResult> GetOrderRefundListApi([FromQuery] OrderRefundQueryDtoApi parm)
+        {
+            var res = await _OrderRefundServiceApi.GetOrderRefundListApi(parm);
+            return SUCCESS(res);
+        }
+
+        /// <summary>
+        /// 添加售后单记录表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpPost("addOrderRefund")]
+        [Log(Title = "添加售后单记录表", BusinessType = BusinessType.ADDORUPDATE)]
+        public async Task<IActionResult> AddOrderRefund([FromBody] AddOrderRefundApiDto parm)
+        {
+            if (parm == null) { throw new CustomException("请求参数错误"); }
+            var user = JwtUtil.GetLoginUser(App.HttpContext);
+            parm.CustomerGuid = user.UserId;
+
+            var modal = parm.Adapt<OrderRefund>().ToCreate(HttpContext);
+            var res = await _OrderRefundServiceApi.AddOrderRefund(modal);
+            return SUCCESS(res);
+        }
+
+
+        /// <summary>
+        /// 获取OrderRefund详情(Api)
+        /// </summary>
+        /// <param name="parm">查询参数</param>
+        /// <returns></returns>
+        [HttpGet("getOrderRefundDetails")]
+        public async Task<IActionResult> GetOrderRefundDetails([FromQuery] OrderRefundDtoApi parm)
+        {
+            //if (parm == null) throw new CustomException("参数错误！");
+
+            var res = await _OrderRefundServiceApi.GetOrderRefundDetails(parm);
+
+            if (res != "[]")
+            {	
+                res = res.Remove(0, 1);
+                res = res.Substring(0, res.Length - 1);
+                var data = res.FromJSON<OrderRefundApiDetailsVo>();
+                return SUCCESS(data);
+            }
+            else
+            {
+                return SUCCESS(res);
+            }
+        }
+
+    }
+}

ARW.WebApi/Controllers/Business/OrderManage/OrderRefunds/OrderRefundController.cs

@@ -15,7 +15,8 @@ using ARW.Model.Models.Business.OrderManage.OrderRefunds;
 using ARW.Model.Vo.Business.OrderManage.OrderRefunds;
 using Microsoft.AspNetCore.Authorization;
 using ARW.Admin.WebApi.Framework;
-
+using ARW.Service.Business.IBusinessService.OrderManage.Orders;
+using Geocoding;
 
 namespace ARW.WebApi.Controllers.Business.OrderManage.OrderRefunds
 {
@@ -54,6 +55,32 @@ namespace ARW.WebApi.Controllers.Business.OrderManage.OrderRefunds
             return SUCCESS(res);
         }
 
+
+        /// <summary>
+        /// 获取售后单详情
+        /// </summary>
+        /// <param name="parm">查询参数</param>
+        /// <returns></returns>
+        [HttpGet("getOrderRefundDetails")]
+        public async Task<IActionResult> GetOrderDetails([FromQuery] OrderRefundDetailsDto parm)
+        {
+            if (parm == null) throw new CustomException("参数错误！");
+
+            var res = await _OrderRefundService.GetOrderRefundDetails(parm);
+
+            if (res != "[]")
+            {
+                var data = res.FromJSON<OrderRefundDetailVo>();
+                return SUCCESS(data);
+            }
+            else
+            {
+                return SUCCESS(res);
+            }
+        }
+
+
+
         /// <summary>
         /// 添加或修改售后单记录表
         /// </summary>