From 962275680f2391b00b9271b5adafae582a95d59a Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Mon, 8 Aug 2022 04:06:14 +0800 Subject: [PATCH] 1 --- BBWY.Client/Models/Enums.cs | 28 +++++++++--- BBWY.Client/Models/Order/Order.cs | 44 ++++++++++--------- .../ViewModels/Order/OrderListViewModel.cs | 44 +++++++++---------- BBWY.Client/Views/Order/OrderList.xaml | 2 +- BBWY.Server.Business/Order/OrderBusiness.cs | 6 +-- BBWY.Server.Model/Enums.cs | 27 +++++++++--- 6 files changed, 91 insertions(+), 60 deletions(-) diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index e599dd2e..561bad27 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -152,14 +152,17 @@ } /// - /// 服务单处理方式 + /// 服务单处理结果 /// public enum ServiceResult { 退货 = 0, 换新 = 1, 原返 = 2, - 线下换新 = 3 + 线下换新 = 3, + 维修 = 4, + 商品补发 = 5, + 仅退款 = 6 } /// @@ -167,9 +170,22 @@ /// public enum ProductResult { - 退款退货 = 0, - 商品入库 = 1, - 报损 = 2, - 换新 = 3 + 一件代发_退回厂家 = 0, + 退回齐越仓 = 1, + 退回京仓 = 2, + 退回云仓 = 3, + 客户无退货 = 4 + } + + /// + /// 商品情况 + /// + public enum ProductHealth + { + 可二次销售 = 0, + 残次品_无法二次销售 = 1, + 厂家退货退款 = 2, + 客户无退货 = 3, + 破损 = 4 } } diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs index 70a2c58a..d298534c 100644 --- a/BBWY.Client/Models/Order/Order.cs +++ b/BBWY.Client/Models/Order/Order.cs @@ -196,14 +196,14 @@ namespace BBWY.Client.Models /// public IList OrderDropShippingList { get; set; } - /// + /*/// /// 售后信息 - /// - public List AfterSaleOrderList { get; set; } + /// */ + //public List AfterSaleOrderList { get; set; } public void LocalConvert() { - ConvertAfterSaleOrderSku(); + //ConvertAfterSaleOrderSku(); ConvertOrderCostDetailToGroup(); } @@ -223,26 +223,28 @@ namespace BBWY.Client.Models } } + /* /// /// 处理售后集合，如果Sku没有售后，则赋值一个空对象进行占位，保持售后信息和Sku对位 /// - private void ConvertAfterSaleOrderSku() - { - if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count())) - return; - var asoList = new List(); - asoList.AddRange(AfterSaleOrderList); - AfterSaleOrderList.Clear(); - foreach (var sku in ItemList) - { - var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id); - if (afterSaleOrderSku == null) - afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true }; - AfterSaleOrderList.Add(afterSaleOrderSku); - } - asoList.Clear(); - - } + */ + //private void ConvertAfterSaleOrderSku() + //{ + // if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count())) + // return; + // var asoList = new List(); + // asoList.AddRange(AfterSaleOrderList); + // AfterSaleOrderList.Clear(); + // foreach (var sku in ItemList) + // { + // var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id); + // if (afterSaleOrderSku == null) + // afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true }; + // AfterSaleOrderList.Add(afterSaleOrderSku); + // } + // asoList.Clear(); + + //} } public class OrderList diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 3f7338a9..f074d2fd 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -743,28 +743,28 @@ namespace BBWY.Client.ViewModels private void EditAfterSaleOrder(object param) { - var paramList = (object[])param; - var orderId = paramList[0].ToString(); - var skuId = paramList[1].ToString(); - - var order = OrderList.FirstOrDefault(o => o.Id == orderId); - var sku = order.ItemList.FirstOrDefault(s => s.Id == skuId); - - var afterSaleOrderSku = order.AfterSaleOrderList.FirstOrDefault(aso => aso.OrderId == orderId && aso.SkuId == skuId); - if (afterSaleOrderSku == null) - { - afterSaleOrderSku = new AfterSaleOrder() - { - Id = 0, - SkuId = skuId, - OrderId = orderId, - ProductId = sku.ProductId, - ShopId = globalContext.User.Shop.ShopId - }; - } - var editAfterSaleOrderSku = new EditAfterSaleOrderSku(afterSaleOrderSku); - editAfterSaleOrderSku.Closed += EditAfterSaleOrderSku_Closed; - editAfterSaleOrderSku.ShowDialog(); + //var paramList = (object[])param; + //var orderId = paramList[0].ToString(); + //var skuId = paramList[1].ToString(); + + //var order = OrderList.FirstOrDefault(o => o.Id == orderId); + //var sku = order.ItemList.FirstOrDefault(s => s.Id == skuId); + + //var afterSaleOrderSku = order.AfterSaleOrderList.FirstOrDefault(aso => aso.OrderId == orderId && aso.SkuId == skuId); + //if (afterSaleOrderSku == null) + //{ + // afterSaleOrderSku = new AfterSaleOrder() + // { + // Id = 0, + // SkuId = skuId, + // OrderId = orderId, + // ProductId = sku.ProductId, + // ShopId = globalContext.User.Shop.ShopId + // }; + //} + //var editAfterSaleOrderSku = new EditAfterSaleOrderSku(afterSaleOrderSku); + //editAfterSaleOrderSku.Closed += EditAfterSaleOrderSku_Closed; + //editAfterSaleOrderSku.ShowDialog(); } private void EditAfterSaleOrderSku_Closed(object sender, EventArgs e) diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml index 111337bd..d16711d0 100644 --- a/BBWY.Client/Views/Order/OrderList.xaml +++ b/BBWY.Client/Views/Order/OrderList.xaml @@ -143,7 +143,7 @@ - aso.RefundAmount != 0 && aso.ProductResult == Enums.ProductResult.退款退货).Select(aso => aso.SkuId); + //var refundAfterSaleOrderSkuIds = afterSaleOrderSkuList.Where(aso => aso.RefundAmount != 0 && aso.ProductResult == Enums.ProductResult.退款退货).Select(aso => aso.SkuId); dbOrderCost.RefundAmount = afterSaleOrderSkuList.Sum(aso => aso.RefundAmount ?? 0); @@ -1048,9 +1048,7 @@ namespace BBWY.Server.Business dbOrderCost.ReissueAfterSaleAmount = afterSaleOrderSkuList.Sum(aso => aso.ReissueAfterSaleAmount ?? 0); //退款采购货款 - dbOrderCost.RefundPurchaseAmount = fsql.Select().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId && - refundAfterSaleOrderSkuIds.Contains(ocd.SkuId)) - .Sum(ocd => ocd.TotalCost); + //dbOrderCost.RefundPurchaseAmount = fsql.Select().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId && refundAfterSaleOrderSkuIds.Contains(ocd.SkuId)).Sum(ocd => ocd.TotalCost); //退款之后平台扣点 dbOrderCost.PlatformCommissionAmount = (dbOrder.OrderSellerPrice - dbOrderCost.RefundAmount) * (dbOrderCost?.PlatformCommissionRatio ?? 0.05M); diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index 3b3b5fa3..bbd51415 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -112,7 +112,7 @@ } /// - /// 服务单处理方式 + /// 服务单处理结果 /// public enum ServiceResult { @@ -120,7 +120,9 @@ 换新 = 1, 原返 = 2, 线下换新 = 3, - 补发 = 4 + 维修 = 4, + 商品补发 = 5, + 仅退款 = 6 } /// @@ -128,10 +130,23 @@ /// public enum ProductResult { - 退款退货 = 0, - 商品入库 = 1, - 报损 = 2, - 换新 = 3 + 一件代发_退回厂家 = 0, + 退回齐越仓 = 1, + 退回京仓 = 2, + 退回云仓 = 3, + 客户无退货 = 4 + } + + /// + /// 商品情况 + /// + public enum ProductHealth + { + 可二次销售 = 0, + 残次品_无法二次销售 = 1, + 厂家退货退款 = 2, + 客户无退货 = 3, + 破损 = 4 } ///