net/key1_beacon_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat 添加售后订单详情接口

Browse Source
This commit is contained in:
AERWEN\26795 2023-10-21 14:57:06 +08:00
parent a9ec7f5349
commit be9073f79f
7 changed files with 377 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ARW.Model/Models/Business/OrderManage/Orders/Order.cs
View File

@ -328,8 +328,13 @@ namespace ARW.Model.Models.Business.OrderManage.Orders
public int OrderSource { get; set; }
/// <summary>
/// 描述 :客户发货备注
/// 空值 : false
/// </summary>
[EpplusTableColumn(Header = "客户发货备注")]
[SugarColumn(ColumnName = "customer_waybill_remark")]
public string CustomerWaybillRemark { get; set; }
}

162
ARW.Model/Vo/Api/OrderManage/OrderRefunds/OrderRefundApiDetailsVo.cs Normal file
View File

@ -0,0 +1,162 @@
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
{
/// <summary>
/// 售后单记录表详情展示对象Api
///
/// @author lwh
/// @date 2023-10-21
/// </summary>
public class OrderRefundApiDetailsVo
{
/// <summary>
/// 描述 :
/// </summary>
public int OrderRefundId { get; set; }
/// <summary>
/// 描述 :
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
public long OrderRefundGuid { get; set; }
/// <summary>
/// 描述 :订单guid
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
public long OrderGuid { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string OrderNo { get; set; }
/// <summary>
/// 店铺名称
/// </summary>
public string StoreName { get; set; }
/// <summary>
/// 订单商品列表
/// </summary>
public List<OrderGoodsApiVo> OrderRefundGoodList { get; set; }
/// <summary>
/// 地址
/// </summary>
public Logistics LogisticsVO { get; set; }
/// <summary>
/// 物流状态
/// </summary>
public TrajectoryVo TrajectoryVos { get; set; }
/// <summary>
/// 描述 :售后类型(1退货退款 2退货(无需退款) 3换货)
/// </summary>
public int RefundType { get; set; }
/// <summary>
/// 描述 : 申请退款金额
/// </summary>
public decimal RefundRequestAmount { get; set; }
/// <summary>
/// 描述 :商家审核状态(1待审核 2已同意 3已拒绝)
/// </summary>
public int MerchantAuditStatus { get; set; }
/// <summary>
/// 描述 :实际退款金额
/// </summary>
public decimal RefundMoney { get; set; }
/// <summary>
/// 售后订单状态描述
/// </summary>
public string EserRightsStatusDesc { get; set; }
/// <summary>
/// 状态（1待审核 2已审核 3已发货 4已完成 ）
/// </summary>
public int Status { get; set; }
/// <summary>
/// 描述 :用户是否发货(1未发货 2已发货)
/// </summary>
public int IsCustomerSend { get; set; }
/// <summary>
/// 描述 :售后单状态(1进行中 2已拒绝 3已完成 4已取消)
/// </summary>
public int OrderRefundStatus { get; set; }
/// <summary>
/// 商家是否收货(1未收货 2已收货)
/// </summary>
public int IsMerchantReceive { get; set; }
/// <summary>
/// 商家退货地址guid
/// </summary>
public long? ShopAddressGuid { get; set; }
/// <summary>
/// 退款原因（字典）
/// </summary>
public int RefundReason { get; set; }
/// <summary>
/// 退款原因
/// </summary>
public string Reason { get; set; }
/// <summary>
/// 描述 :客户退款说明
/// </summary>
public string CustomerRefundDesc { get; set; }
/// <summary>
/// 描述 :客户退款凭证
/// </summary>
public string CustomerRefundImg { get; set; }
/// <summary>
/// 快递公司guid
/// </summary>
public long? LogisticsCompanyGuid { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string ExpressNo { get; set; }
}
}

50
ARW.Model/Vo/Api/OrderManage/OrderRefunds/OrderRefundApiVo.cs
View File

@ -100,54 +100,4 @@ namespace ARW.Model.Vo.Api.OrderManage.OrderRefunds
}
/// <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; }
}
}

5
ARW.Model/Vo/Business/OrderManage/Orders/OrderDetailVo.cs
View File

@ -135,6 +135,11 @@ namespace ARW.Model.Vo.Business.OrderManage.Orders
/// </summary>
public OrderReceiveVo OrderReceive { get; set; }
/// <summary>
/// 客户发货备注
/// </summary>
public string CustomerWaybillRemark { get; set; }
}
}

257
ARW.Service/Api/BusinessService/OrderManage/OrderRefunds/OrderRefundServiceApi.cs
View File

@ -25,6 +25,17 @@ using ARW.Model.Models.Business.GoodsManager.GoodsSpecs.SpecValues;
using ARW.Repository.Business.GoodsManager.GoodsSpecs.SpecValues;
using ARW.Service.Api.IBusinessService.OrderManage.Orders;
using OfficeOpenXml;
using Newtonsoft.Json;
using ARW.Repository.Business.OrderManage.OrderCustomerAddreses;
using ARW.Service.Business.IBusinessService.Custom.Regions;
using Senparc.Weixin.WxOpen.AdvancedAPIs.WxApp.WxAppJson;
using ARW.Repository.Business.ShopManager.ShopAddresss;
using ARW.Service.Api.IBusinessService.Custom.Regions;
using ARW.Model.Models.Business.OrderManage.Orders;
using ARW.Service.System.IService;
using Senparc.CO2NET.Extensions;
using ARW.Model.Models.Business.LogisticsManage.LogisticsCompanys;
using ARW.Repository.Business.LogisticsManage.LogisticsCompanys;
namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
{
@ -41,16 +52,24 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
private readonly OrderRepository _OrderRepository;
private readonly OrderGoodsRepository _OrderGoodsRepository;
private readonly GoodsRepository _GoodsRepository;
private readonly ShopAddressRepository _ShopAddressRepository;
private readonly LogisticsCompanyRepository _LogisticsCompanyRepository;
private readonly IOrderServiceApi _OrderServiceApi;
private readonly IRegionService _RegionService;
private readonly ISysDictDataService _SysDictDataService;
public OrderRefundServiceImplApi(OrderRefundRepository OrderRefundRepository, OrderRepository orderRepository, OrderGoodsRepository orderGoodsRepository, GoodsRepository goodsRepository, IOrderServiceApi orderServiceApi)
public OrderRefundServiceImplApi(OrderRefundRepository OrderRefundRepository, OrderRepository orderRepository, OrderGoodsRepository orderGoodsRepository, GoodsRepository goodsRepository, IOrderServiceApi orderServiceApi, ShopAddressRepository shopAddressRepository, IRegionService regionService, ISysDictDataService sysDictDataService, LogisticsCompanyRepository logisticsCompanyRepository)
{
this._OrderRefundRepository = OrderRefundRepository;
_OrderRepository = orderRepository;
_OrderGoodsRepository = orderGoodsRepository;
_GoodsRepository = goodsRepository;
_OrderServiceApi = orderServiceApi;
_ShopAddressRepository = shopAddressRepository;
_RegionService = regionService;
_SysDictDataService = sysDictDataService;
_LogisticsCompanyRepository = logisticsCompanyRepository;
}
#region Api接口代码
@ -96,28 +115,7 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
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;
item.OrderRefundGoodList = await GetOrderGoodsList(item.OrderGuid);
/* 处理售后订单状态描述 */
@ -210,30 +208,110 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
var query = _OrderRefundRepository
.Queryable()
.Where(s => s.OrderRefundGuid == parm.OrderRefundGuid)
.Select(s => new OrderRefundApiDetailsVo
.LeftJoin<Shop>((s, c) => s.ShopGuid == c.ShopGuid)
.LeftJoin<Order>((s, c, d) => s.OrderGuid == d.OrderGuid)
.Select((s, c, d) => new OrderRefundApiDetailsVo
{
OrderRefundId = s.OrderRefundId,
OrderRefundGuid = s.OrderRefundGuid,
OrderNo = d.OrderNumber,
StoreName = c.ShopName,
OrderGuid = s.OrderGuid,
CustomerGuid = s.CustomerGuid,
RefundType = s.RefundType,
MerchantAuditStatus = s.MerchantAuditStatus,
RefundMoney = s.RefundMoney,
IsCustomerSend = s.IsCustomerSend,
OrderRefundStatus = s.OrderRefundStatus,
ShopAddressGuid = s.ShopRefundAddressGuid,
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,
ExpressNo = s.ExpressNo
}).Take(1);
return await query.ToJsonAsync();
var json = await query.ToJsonAsync();
if (json != "[]")
{
json = json.Remove(0, 1);
json = json.Substring(0, json.Length - 1);
var data = JsonConvert.DeserializeObject<OrderRefundApiDetailsVo>(json);
// 获取订单商品列表
data.OrderRefundGoodList = await GetOrderGoodsList(data.OrderGuid);
// 处理退款原因
var dictList = _SysDictDataService.SelectDictDataByType("refund_reason");
foreach (var item in dictList)
{
if(Convert.ToInt32(item.DictValue) == data.RefundReason)
{
data.Reason = item.DictLabel;
}
}
// 处理快递状态
if(data.LogisticsCompanyGuid != null)
{
data.TrajectoryVos = new TrajectoryVo();
var company = await _LogisticsCompanyRepository.GetFirstAsync(s => s.LogisticsCompanyGuid == data.LogisticsCompanyGuid);
data.TrajectoryVos.LogisticsCompanyCode = data.ExpressNo;
data.TrajectoryVos.LogisticsCompanyName = company.LogisticsCompanyName;
}
/* 处理售后订单状态描述 */
// 待审核
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 = "退款/售后己完成";
}
// 商家地址
var shopAddress = await _ShopAddressRepository.GetFirstAsync(s => s.ShopAddressGuid == data.ShopAddressGuid);
if (shopAddress != null)
{
var logistics = new Logistics
{
ReceiverAddressId = shopAddress.ShopAddressGuid,
ReceiverName = shopAddress.ShopAddressContactName,
ReceiverPhone = shopAddress.ShopAddressContactNumber,
ReceiverProvince = await _RegionService.GetRegionName(shopAddress.ProvinceId),
ReceiverCity = await _RegionService.GetRegionName(shopAddress.CityId),
receiverCountry = await _RegionService.GetRegionName(shopAddress.DistrictId),
ReceiverAddress = shopAddress.ShopAddressDetailedAddress
};
data.LogisticsVO = logistics;
}
json = data.ToJson();
}
return json;
}
@ -242,39 +320,104 @@ namespace ARW.Service.Api.BusinessService.OrderManage.OrderRefunds
/// <summary>
/// 处理售后订单状态描述
/// 获取售后订单商品列表
/// </summary>
/// <param name="orderGuid"></param>
/// <returns></returns>
public async Task<List<OrderGoodsApiVo>> GetOrderGoodsList(long orderGuid)
{
var orderRefundGoodList = new List<OrderGoodsApiVo>();
var orderGoodsList = await _OrderGoodsRepository.GetListAsync(s => s.OrderGuid == 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);
orderRefundGoodList.Add(orderGood);
}
return orderRefundGoodList;
}
/// <summary>
/// 处理物流状态
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
//public OrderRefundVoApi GetOrderRefundStatus(OrderRefundVoApi data)
//public OrderRefundApiDetailsVo GetTrajectory(Order order, OrderRefundApiDetailsVo data)
//{
// // 待审核
// if (data.MerchantAuditStatus == 1)
// data.TrajectoryVos = new TrajectoryVo();
// var trajectoryList = new List<Trajectory>();
// // 已下单(待发货)
// if (order.OrderStatus == 1)
// {
// data.Status = 1;
// data.EserRightsStatusDesc = "商家将尽快确认您的退款申请";
// var trajectoryNodeList1 = new List<TrajectoryNode> { GetTrajectoryNode("订单已提交", order.Create_time) };
// var trajectory1 = GetTrajectory("", "", trajectoryNodeList1, 3);
// trajectoryList.Add(trajectory1);
// var trajectoryNodeList2 = new List<TrajectoryNode> { GetTrajectoryNode("订单已经支付成功，支付方式为：微信支付", order.PayTime) };
// var trajectory2 = GetTrajectory("已下单", "https://cdn-we-retail.ym.tencent.com/web/trajectoryIcons/ordered.svg", trajectoryNodeList2, 2);
// trajectoryList.Add(trajectory2);
// // 运输中(已发货，待收货)
// if (order.DeliveryStatus == 2 && order.ReceiptStatus == 1 && order.PayStatus == 2 && order.OrderStatus == 1)
// {
// data.TrajectoryVos.LogisticsCompanyCode = order.LogisticsTrackingNumber;
// data.TrajectoryVos.LogisticsCompanyName = order.LogisticsCompany;
// var trajectoryNodeList3 = new List<TrajectoryNode> { GetTrajectoryNode($"商家已发货，物流承运商：{order.LogisticsCompany}", order.DeliveryTime) };
// // 对接快递100接口
// //var company = _LogisticsCompanyRepository.GetFirst(s => s.LogisticsCompanyGuid == order.LogisticsCompanyGuid);
// //var trackRes = Kuaidi100.GetQueryTrack(company.LogisticsCompanyCode, order.LogisticsTrackingNumber);
// var trajectory3 = GetTrajectory("已发货", "deliver", trajectoryNodeList3, 1);
// trajectoryList.Add(trajectory3);
// }
// // 已审核
// 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 = "退款/售后己完成";
// }
// //foreach (var item in trajectoryList)
// //{
// // item.Nodes = item.Nodes.OrderBy(s => s.Sort).ToList();
// //}
// trajectoryList = trajectoryList.OrderBy(s => s.Sort).ToList();
// data.TrajectoryVos.Trajectorys = trajectoryList;
// return data;
//}
//public Trajectory GetTrajectory(string title, string icon, List<TrajectoryNode> trajectoryNodeList, int sort)
//{
// var trajectory = new Trajectory();
// trajectory.Title = title;
// trajectory.Icon = icon;
// trajectory.Nodes = trajectoryNodeList;
// trajectory.Sort = sort;
// return trajectory;
//}
//public TrajectoryNode GetTrajectoryNode(string status, DateTime? time)
//{
// var trajectoryNode = new TrajectoryNode();
// trajectoryNode.Status = status;
// trajectoryNode.Timestamp = time;
// return trajectoryNode;
//}
#endregion

3
ARW.Service/Business/BusinessService/OrderManage/Orders/OrderService.cs
View File

@ -169,7 +169,8 @@ namespace ARW.Service.Business.BusinessService.OrderManage.Orders
TransactionId = s.TransactionId,
IsComment = s.IsComment,
OrderSource = s.OrderSource,
CreateTime = s.Create_time
CreateTime = s.Create_time,
CustomerWaybillRemark = s.CustomerWaybillRemark
}).Take(1);
var json = await query.ToJsonAsync();

2
ARW.WebApi/Controllers/Api/OrderManage/OrderRefunds/OrderRefundApiController.cs
View File

@ -79,8 +79,6 @@ namespace ARW.WebApi.Controllers.Api.OrderManage.OrderRefunds
if (res != "[]")
{
res = res.Remove(0, 1);
res = res.Substring(0, res.Length - 1);
var data = res.FromJSON<OrderRefundApiDetailsVo>();
return SUCCESS(data);
}