1

BBWY.Client/Models/Enums.cs

@@ -152,14 +152,17 @@
     }
 
     /// <summary>
-    /// 服务单处理方式
+    /// 服务单处理结果
     /// </summary>
     public enum ServiceResult
     {
         退货 = 0,
         换新 = 1,
         原返 = 2,
-        线下换新 = 3
+        线下换新 = 3,
+        维修 = 4,
+        商品补发 = 5,
+        仅退款 = 6
     }
 
     /// <summary>
@@ -167,9 +170,22 @@
     /// </summary>
     public enum ProductResult
     {
-        退款退货 = 0,
+        一件代发_退回厂家 = 0,
-        商品入库 = 1,
+        退回齐越仓 = 1,
-        报损 = 2,
+        退回京仓 = 2,
-        换新 = 3
+        退回云仓 = 3,
+        客户无退货 = 4
+    }
+
+    /// <summary>
+    /// 商品情况
+    /// </summary>
+    public enum ProductHealth
+    {
+        可二次销售 = 0,
+        残次品_无法二次销售 = 1,
+        厂家退货退款 = 2,
+        客户无退货 = 3,
+        破损 = 4
     }
 }

BBWY.Client/Models/Order/Order.cs

@@ -196,14 +196,14 @@ namespace BBWY.Client.Models
         /// </summary>
         public IList<OrderDropShipping> OrderDropShippingList { get; set; }
 
-        /// <summary>
+        /*/// <summary>
         /// 售后信息
-        /// </summary>
+        /// </summary>*/
-        public List<AfterSaleOrder> AfterSaleOrderList { get; set; }
+        //public List<AfterSaleOrder> AfterSaleOrderList { get; set; }
 
         public void LocalConvert()
         {
-            ConvertAfterSaleOrderSku();
+            //ConvertAfterSaleOrderSku();
             ConvertOrderCostDetailToGroup();
         }
 
@@ -223,26 +223,28 @@ namespace BBWY.Client.Models
             }
         }
 
+        /*
         /// <summary>
         /// 处理售后集合，如果Sku没有售后，则赋值一个空对象进行占位，保持售后信息和Sku对位
         /// </summary>
-        private void ConvertAfterSaleOrderSku()
+        */
-        {
+        //private void ConvertAfterSaleOrderSku()
-            if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count()))
+        //{
-                return;
+        //    if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count()))
-            var asoList = new List<AfterSaleOrder>();
+        //        return;
-            asoList.AddRange(AfterSaleOrderList);
+        //    var asoList = new List<AfterSaleOrder>();
-            AfterSaleOrderList.Clear();
+        //    asoList.AddRange(AfterSaleOrderList);
-            foreach (var sku in ItemList)
+        //    AfterSaleOrderList.Clear();
-            {
+        //    foreach (var sku in ItemList)
-                var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id);
+        //    {
-                if (afterSaleOrderSku == null)
+        //        var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id);
-                    afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true };
+        //        if (afterSaleOrderSku == null)
-                AfterSaleOrderList.Add(afterSaleOrderSku);
+        //            afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true };
-            }
+        //        AfterSaleOrderList.Add(afterSaleOrderSku);
-            asoList.Clear();
+        //    }
-
+        //    asoList.Clear();
-        }
+
+        //}
     }
 
     public class OrderList

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -743,28 +743,28 @@ namespace BBWY.Client.ViewModels
 
         private void EditAfterSaleOrder(object param)
         {
-            var paramList = (object[])param;
+            //var paramList = (object[])param;
-            var orderId = paramList[0].ToString();
+            //var orderId = paramList[0].ToString();
-            var skuId = paramList[1].ToString();
+            //var skuId = paramList[1].ToString();
-
+
-            var order = OrderList.FirstOrDefault(o => o.Id == orderId);
+            //var order = OrderList.FirstOrDefault(o => o.Id == orderId);
-            var sku = order.ItemList.FirstOrDefault(s => s.Id == skuId);
+            //var sku = order.ItemList.FirstOrDefault(s => s.Id == skuId);
-
+
-            var afterSaleOrderSku = order.AfterSaleOrderList.FirstOrDefault(aso => aso.OrderId == orderId && aso.SkuId == skuId);
+            //var afterSaleOrderSku = order.AfterSaleOrderList.FirstOrDefault(aso => aso.OrderId == orderId && aso.SkuId == skuId);
-            if (afterSaleOrderSku == null)
+            //if (afterSaleOrderSku == null)
-            {
+            //{
-                afterSaleOrderSku = new AfterSaleOrder()
+            //    afterSaleOrderSku = new AfterSaleOrder()
-                {
+            //    {
-                    Id = 0,
+            //        Id = 0,
-                    SkuId = skuId,
+            //        SkuId = skuId,
-                    OrderId = orderId,
+            //        OrderId = orderId,
-                    ProductId = sku.ProductId,
+            //        ProductId = sku.ProductId,
-                    ShopId = globalContext.User.Shop.ShopId
+            //        ShopId = globalContext.User.Shop.ShopId
-                };
+            //    };
-            }
+            //}
-            var editAfterSaleOrderSku = new EditAfterSaleOrderSku(afterSaleOrderSku);
+            //var editAfterSaleOrderSku = new EditAfterSaleOrderSku(afterSaleOrderSku);
-            editAfterSaleOrderSku.Closed += EditAfterSaleOrderSku_Closed;
+            //editAfterSaleOrderSku.Closed += EditAfterSaleOrderSku_Closed;
-            editAfterSaleOrderSku.ShowDialog();
+            //editAfterSaleOrderSku.ShowDialog();
         }
 
         private void EditAfterSaleOrderSku_Closed(object sender, EventArgs e)

BBWY.Client/Views/Order/OrderList.xaml

@@ -143,7 +143,7 @@
                     <c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
                                Command="{Binding SetSearchDateCommand}"
                                CommandParameter="{StaticResource d3}"/>
-                    <c:BButton Content="近7天" Width="50" Height="25" Margin="5,0,0,0"
+                    <c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
                                Command="{Binding SetSearchDateCommand}"
                                CommandParameter="{StaticResource d7}"/>
                     <c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1039,7 +1039,7 @@ namespace BBWY.Server.Business
                 afterSaleOrderSkuList.Add(afterSaleOrder);
             }
 
-            var refundAfterSaleOrderSkuIds = afterSaleOrderSkuList.Where(aso => 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<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId &&
+            //dbOrderCost.RefundPurchaseAmount = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId && refundAfterSaleOrderSkuIds.Contains(ocd.SkuId)).Sum(ocd => ocd.TotalCost);
-                                                                                           refundAfterSaleOrderSkuIds.Contains(ocd.SkuId))
-                                                                             .Sum(ocd => ocd.TotalCost);
 
             //退款之后平台扣点
             dbOrderCost.PlatformCommissionAmount = (dbOrder.OrderSellerPrice - dbOrderCost.RefundAmount) * (dbOrderCost?.PlatformCommissionRatio ?? 0.05M);

BBWY.Server.Model/Enums.cs

@@ -112,7 +112,7 @@
         }
 
         /// <summary>
-        /// 服务单处理方式
+        /// 服务单处理结果
         /// </summary>
         public enum ServiceResult
         {
@@ -120,7 +120,9 @@
             换新 = 1,
             原返 = 2,
             线下换新 = 3,
-            补发 = 4
+            维修 = 4,
+            商品补发 = 5,
+            仅退款 = 6
         }
 
         /// <summary>
@@ -128,10 +130,23 @@
         /// </summary>
         public enum ProductResult
         {
-            退款退货 = 0,
+            一件代发_退回厂家 = 0,
-            商品入库 = 1,
+            退回齐越仓 = 1,
-            报损 = 2,
+            退回京仓 = 2,
-            换新 = 3
+            退回云仓 = 3,
+            客户无退货 = 4
+        }
+
+        /// <summary>
+        /// 商品情况
+        /// </summary>
+        public enum ProductHealth
+        {
+            可二次销售 = 0,
+            残次品_无法二次销售 = 1,
+            厂家退货退款 = 2,
+            客户无退货 = 3,
+            破损 = 4
         }
 
         /// <summary>