feat 添加售后订单列表接口

This commit is contained in:
AERWEN\26795 2023-10-20 22:57:53 +08:00
parent 291d170ee6
commit a9ec7f5349
4 changed files with 216 additions and 99 deletions

View File

@ -1,7 +1,9 @@
using ARW.Model.Vo.Api.OrderManage.Orders;
using Newtonsoft.Json;
using OfficeOpenXml.Attributes;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace ARW.Model.Vo.Api.OrderManage.OrderRefunds
{
@ -13,20 +15,15 @@ namespace ARW.Model.Vo.Api.OrderManage.OrderRefunds
/// </summary>
public class OrderRefundVoApi
{
/// <summary>
/// 描述 :
/// </summary>
[EpplusIgnore]
public int OrderRefundId { get; set; }
/// <summary>
/// 描述 :
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
[EpplusIgnore]
public long OrderRefundGuid { get; set; }
@ -34,134 +31,77 @@ namespace ARW.Model.Vo.Api.OrderManage.OrderRefunds
/// 描述 :订单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; }
public string StoreName { get; set; }
public List<OrderGoodsApiVo> OrderRefundGoodList { 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 decimal RefundRequestAmount { 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; }
public string EserRightsStatusDesc { get; set; }
/// <summary>
/// 状态1待审核 2已审核 3已发货 4已完成
/// </summary>
public int Status { 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>
/// 描述 :客户发货备注
/// 空值 : true
/// 商家是否收货(1未收货 2已收货)
/// </summary>
[EpplusTableColumn(Header = "客户发货备注")]
public string CustomerWaybillRemark { get; set; }
public int IsMerchantReceive { get; set; }
/// <summary>
/// 商家收货时间
/// </summary>
public DateTime? MerchantReceiveTime { get; set; }
}
/// <summary>
/// <summary>
/// 售后单记录表详情展示对象Api
/// </summary>
public class OrderRefundApiDetailsVo

View File

@ -0,0 +1,63 @@
using Newtonsoft.Json;
using OfficeOpenXml.Attributes;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace ARW.Model.Vo.Api.OrderManage.Orders
{
/// <summary>
/// 售后订单商品展示对象Api
///
/// @author lwh
/// @date 2023-10-14
/// </summary>
public class OrderRefundGood
{
/// <summary>
/// 描述 : 商品guid
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
public long GoodsGuId { get; set; }
/// <summary>
/// 描述 :封面
/// </summary>
public string Thumb { get; set; }
/// <summary>
/// 描述 :商品名称
/// </summary>
public string Title { get; set; }
/// <summary>
/// 描述 :商品skuId
/// </summary>
public int? SkuId { get; set; }
/// <summary>
/// 描述 : 商品规格
/// </summary>
public List<OrderGoodsSpecApiVo> Specifications { get; set; }
/// <summary>
/// 商品价格
/// </summary>
public decimal Price { get; set; }
/// <summary>
/// 购买数量
/// </summary>
public int BuyQuantity { get; set; }
}
}

View File

@ -14,6 +14,17 @@ using ARW.Model.Dto.Api.OrderManage.OrderRefunds;
using ARW.Model.Models.Business.OrderManage.OrderRefunds;
using ARW.Model.Vo.Api.OrderManage.OrderRefunds;
using System.Reflection.Metadata;
using ARW.Model.Models.Business.ShopManager.Shops;
using ARW.Model.Vo.Api.OrderManage.Orders;
using ARW.Repository.Business.OrderManage.Orders;
using ARW.Repository.Business.OrderManage.OrderGoodss;
using ARW.Repository.Business.GoodsManager.Goodss;
using ARW.Repository.Business.GoodsManager.GoodsSpecs.GoodsSkus;
using ARW.Model.Models.Business.GoodsManager.GoodsSpecs.GoodsSkus;
using ARW.Model.Models.Business.GoodsManager.GoodsSpecs.SpecValues;
using ARW.Repository.Business.GoodsManager.GoodsSpecs.SpecValues;
using ARW.Service.Api.IBusinessService.OrderManage.Orders;
using OfficeOpenXml;
namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
{
@ -27,10 +38,19 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
public class OrderRefundServiceImplApi : BaseService<OrderRefund>, IOrderRefundServiceApi
{
private readonly OrderRefundRepository _OrderRefundRepository;
private readonly OrderRepository _OrderRepository;
private readonly OrderGoodsRepository _OrderGoodsRepository;
private readonly GoodsRepository _GoodsRepository;
private readonly IOrderServiceApi _OrderServiceApi;
public OrderRefundServiceImplApi(OrderRefundRepository OrderRefundRepository)
public OrderRefundServiceImplApi(OrderRefundRepository OrderRefundRepository, OrderRepository orderRepository, OrderGoodsRepository orderGoodsRepository, GoodsRepository goodsRepository, IOrderServiceApi orderServiceApi)
{
this._OrderRefundRepository = OrderRefundRepository;
_OrderRepository = orderRepository;
_OrderGoodsRepository = orderGoodsRepository;
_GoodsRepository = goodsRepository;
_OrderServiceApi = orderServiceApi;
}
#region Api接口代码
@ -56,33 +76,78 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
var query = _OrderRefundRepository
.Queryable()
.Where(predicate.ToExpression())
.LeftJoin<Shop>((s, c) => s.ShopGuid == c.ShopGuid)
.OrderBy(s => s.Create_time, OrderByType.Desc)
.Select(s => new OrderRefundVoApi
.Select((s, c) => new OrderRefundVoApi
{
OrderRefundId = s.OrderRefundId,
OrderRefundGuid = s.OrderRefundGuid,
StoreName = c.ShopName,
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,
CustomerWaybillRemark = s.CustomerWaybillRemark,
MerchantReceiveTime = s.MerchantReceiveTime
});
return await query.ToPageAsync(parm);
var list = await query.ToPageAsync(parm);
foreach (var item in list.Result)
{
var orderRefundGood = new List<OrderGoodsApiVo>();
/* 获取售后订单商品列表 */
var orderGoodsList = await _OrderGoodsRepository.GetListAsync(s => s.OrderGuid == item.OrderGuid);
foreach (var _item in orderGoodsList)
{
var good = await _GoodsRepository.GetFirstAsync(s => s.GoodsGuid == _item.GoodsGuid);
var orderGood = new OrderGoodsApiVo
{
GoodsGuId = good.GoodsGuid,
Thumb = good.GoodsPicture.Split(',').First(),
Title = good.GoodsName,
SkuId = _item.GoodsSkuId,
Price = _item.GoodsPrice,
BuyQuantity = _item.GoodsTotalNum
};
if (_item.GoodsSkuId != 0)
orderGood.Specifications = await _OrderServiceApi.GetGoodsSpecList(_item.GoodsSkuId);
orderRefundGood.Add(orderGood);
}
item.OrderRefundGoodList = orderRefundGood;
/* 处理售后订单状态描述 */
// 待审核
if (item.MerchantAuditStatus == 1)
{
item.Status = 1;
item.EserRightsStatusDesc = "商家将尽快确认您的退款申请";
}
// 已审核
if (item.MerchantAuditStatus == 2)
{
item.Status = 2;
item.EserRightsStatusDesc = "商家已审核确认预计1小时内发起退款";
}
// 已发货
if (item.IsCustomerSend == 2)
{
item.Status = 3;
item.EserRightsStatusDesc = "商家已退款,退回资金将原路三个工作日内返回您的账户";
}
if (item.OrderRefundStatus == 3)
{
item.Status = 4;
item.EserRightsStatusDesc = "退款/售后己完成";
}
}
return list;
}
@ -172,6 +237,47 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
}
#region
/// <summary>
/// 处理售后订单状态描述
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
//public OrderRefundVoApi GetOrderRefundStatus(OrderRefundVoApi data)
//{
// // 待审核
// if (data.MerchantAuditStatus == 1)
// {
// data.Status = 1;
// data.EserRightsStatusDesc = "商家将尽快确认您的退款申请";
// }
// // 已审核
// if (data.MerchantAuditStatus == 2)
// {
// data.Status = 2;
// data.EserRightsStatusDesc = "商家已审核确认预计1小时内发起退款";
// }
// // 已发货
// if (data.IsCustomerSend == 2)
// {
// data.Status = 3;
// data.EserRightsStatusDesc = "商家已退款,退回资金将原路三个工作日内返回您的账户";
// }
// if (data.OrderRefundStatus == 3)
// {
// data.Status = 4;
// data.EserRightsStatusDesc = "退款/售后己完成";
// }
// return data;
//}
#endregion
#endregion
}

View File

@ -66,5 +66,13 @@ namespace ARW.Service.Api.IBusinessService.OrderManage.Orders
/// <returns></returns>
Task<string> GetOrderDetails(OrderDtoApi parm);
/// <summary>
/// 获取订单商品规格
/// </summary>
/// <param name="skuId"></param>
/// <returns></returns>
Task<List<OrderGoodsSpecApiVo>> GetGoodsSpecList(int? skuId);
}
}