订单导出增加应付，实收

修改退款 未填信息给提示
修改退款 已有采购订单号，仅展示退款金额输入框
查询条件支持仅显示未处理
代发订单退回厂家，进退货款
订单管理-修改售后按钮跳转售后单列表
服务单处理结果增加SD退货

BBWY.Client/APIServices/AfterOrderService.cs

@@ -20,6 +20,7 @@ namespace BBWY.Client.APIServices
                                                                              string spu,
                                                                              string sku,
                                                                              string serviceId,
+                                                                             bool onlyUnhandle,
                                                                              int pageIndex,
                                                                              int pageSize)
         {
@@ -32,6 +33,7 @@ namespace BBWY.Client.APIServices
                 spu,
                 sku,
                 serviceId,
+                onlyUnhandle,
                 pageIndex,
                 pageSize
             }, null, HttpMethod.Post);

BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs

@@ -74,10 +74,25 @@ namespace BBWY.Client.Models
 
         public string VenderRemark { get; set; }
 
+        /// <summary>
+        /// 订单货款金额
+        /// </summary>
+        public decimal OrderSellerPrice { get; set; }
+
+        /// <summary>
+        /// 实收金额
+        /// </summary>
+        public decimal ActualAmount { get; set; }
+
+        /// <summary>
+        /// 用户应付金额
+        /// </summary>
+        public decimal OrderPayment { get; set; }
+
         public override string ToString()
         {
-            //日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注
+            //日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注
-            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{OrderState},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{Profit},{ProfitRatio},{ConsigneeStr},{VenderRemark}";
+            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{OrderState},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{OrderPayment},{ActualAmount},{Profit},{ProfitRatio},{ConsigneeStr},{VenderRemark}";
         }
     }
 }

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -43,6 +43,7 @@ namespace BBWY.Client.ViewModels
         private bool onlyDF;
         private bool excludeSD;
         private bool excludeCanceled;
+        private bool onlyUnhandle;
         private Random random;
         private GlobalContext globalContext;
         private bool? includeAfterOrder;
@@ -82,6 +83,11 @@ namespace BBWY.Client.ViewModels
         public bool? IncludeAfterOrder { get => includeAfterOrder; set { Set(ref includeAfterOrder, value); } }
         public string SearchServiceId { get => searchServiceId; set { Set(ref searchServiceId, value); } }
 
+        /// <summary>
+        /// 仅显示未处理
+        /// </summary>
+        public bool OnlyUnhandle { get => onlyUnhandle; set { Set(ref onlyUnhandle, value); } }
+
         public ToDayOrderAchievement ToDayOrderAchievement { get; set; }
 
         public ICommand SetOrderStateCommand { get; set; }
@@ -112,6 +118,8 @@ namespace BBWY.Client.ViewModels
 
         public ICommand SetIncludeAfterOrderCommand { get; set; }
 
+        public ICommand FindAfterSaleOrderCommand { get; set; }
+
         public ICommand EditAfterSaleOrderCommand { get; set; }
 
         public ICommand EditAfterSaleOrderRefundPurchaseAmountCommand { get; set; }
@@ -182,6 +190,7 @@ namespace BBWY.Client.ViewModels
             SetIncludeAfterOrderCommand = new RelayCommand(SetIncludeAfterOrder);
             EditAfterSaleOrderCommand = new RelayCommand<AfterSaleOrder>(EditAfterSaleOrder);
             EditAfterSaleOrderRefundPurchaseAmountCommand = new RelayCommand<AfterSaleOrder>(EditAfterSaleOrderRefundPurchaseAmount);
+            FindAfterSaleOrderCommand = new RelayCommand<object>(FindAfterSaleOrder);
             SearchOrderCommand.Execute(null);
         }
 
@@ -233,6 +242,17 @@ namespace BBWY.Client.ViewModels
             Task.Factory.StartNew(() => LoadOrder(1));
         }
 
+        public void SetIncludeAfterOrder(string orderId, string skuId, DateTime startDate, DateTime endDate)
+        {
+            InitSearchParam();
+            SearchOrderId = orderId;
+            SearchSku = skuId;
+            StartDate = startDate;
+            EndDate = endDate;
+            IncludeAfterOrder = true;
+            Task.Factory.StartNew(() => LoadOrder(1));
+        }
+
         public void RefreshOrder(string orderId)
         {
             //Task.Factory.StartNew(() => LoadOrder(PageIndex));
@@ -352,6 +372,7 @@ namespace BBWY.Client.ViewModels
                                                                    SearchProductId,
                                                                    SearchSku,
                                                                    SearchServiceId,
+                                                                   OnlyUnhandle,
                                                                    pageIndex,
                                                                    pageSize);
 
@@ -808,7 +829,7 @@ namespace BBWY.Client.ViewModels
                                                          try
                                                          {
                                                              var list = r.Data.Select(x => x.ToString()).ToList();
-                                                             list.Insert(0, "日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注");
+                                                             list.Insert(0, "日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注");
                                                              System.IO.File.WriteAllLines(ssaveFileName, list, Encoding.UTF8);
                                                              App.Current.Dispatcher.Invoke(() => MessageBox.Show("导出完成", "导出"));
                                                          }
@@ -891,5 +912,15 @@ namespace BBWY.Client.ViewModels
                 RefreshAfterOrder(afterSaleOrder.Id);
             });
         }
+
+        private void FindAfterSaleOrder(object param)
+        {
+            var paramList = (object[])param;
+            var orderId = paramList[0].ToString();
+            var skuId = paramList[1].ToString();
+            var startDate = DateTime.Parse(paramList[2].ToString()).Date;
+            var endDate = DateTime.Now.Date;
+            SetIncludeAfterOrder(orderId, skuId, startDate, endDate);
+        }
     }
 }

BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml

@@ -40,11 +40,16 @@
             <c:BTextBox Grid.Column="1" Width="190" HorizontalAlignment="Left" Margin="5,0,0,0"
                         Text="{Binding SaleOrder.RefundPurchaseAmount}"/>
             <c:BTextBox Grid.Row="1" Grid.Column="1" Width="190" HorizontalAlignment="Left" Margin="5,0,0,0"
-                        Text="{Binding SaleOrder.RefundAlipayOrderNo}"/>
+                        Text="{Binding SaleOrder.RefundAlipayOrderNo}"
+                        IsEnabled="{Binding SaleOrder.PurchaseOrderId,ConverterParameter=#null:true:false,Converter={StaticResource objConverter}}"
+                        DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>
             <c:BTextBox Grid.Row="2" Grid.Column="1" Width="190" HorizontalAlignment="Left" Margin="5,0,0,0"
-                        Text="{Binding SaleOrder.RefundMerchantOrderNo}"/>
+                        Text="{Binding SaleOrder.RefundMerchantOrderNo}"
+                        IsEnabled="{Binding SaleOrder.PurchaseOrderId,ConverterParameter=#null:true:false,Converter={StaticResource objConverter}}"
+                        DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>
 
-            <TextBlock Grid.Row="3" Grid.Column="1" Text="支付或商户订单号至少填一个" VerticalAlignment="Center" Margin="5,0,0,0"/>
+            <TextBlock Grid.Row="3" Grid.Column="1" Text="支付或商户订单号至少填一个" VerticalAlignment="Center" Margin="5,0,0,0"
+                       Visibility="{Binding SaleOrder.PurchaseOrderId,ConverterParameter=#null:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
         </Grid>
 
         <c:BButton x:Name="btn_Save" Content="保存" Grid.Row="2" Width="60" HorizontalAlignment="Right" Margin="0,0,8,0"

BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml.cs

@@ -20,8 +20,13 @@ namespace BBWY.Client.Views.Order
 
         private void btn_Save_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            if (string.IsNullOrEmpty(SaleOrder.RefundAlipayOrderNo) && string.IsNullOrEmpty(SaleOrder.RefundMerchantOrderNo))
+            if (string.IsNullOrEmpty(SaleOrder.PurchaseOrderId) &&
+                string.IsNullOrEmpty(SaleOrder.RefundAlipayOrderNo) &&
+                string.IsNullOrEmpty(SaleOrder.RefundMerchantOrderNo))
+            {
+                MessageBox.Show("信息不完整", "提示");
                 return;
+            }
             this.DialogResult = true;
             this.Close();
         }

BBWY.Client/Views/Order/OrderList.xaml

@@ -270,7 +270,7 @@
             <Border Grid.Row="4" Background="{StaticResource Border.Background}"
                     Visibility="{Binding Visibility,ElementName=listbox_afterSaleOrder}">
                 <StackPanel Orientation="Horizontal" >
-                    <CheckBox Content="仅显示未处理" Margin="5,0,0,0" IsChecked="{Binding OnlyDF,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/>
+                    <CheckBox Content="仅显示未处理" Margin="5,0,0,0" IsChecked="{Binding OnlyUnhandle}"/>
                 </StackPanel>
             </Border>
 
@@ -439,12 +439,13 @@
                                                             </StackPanel>
                                                         </StackPanel>
                                                         <c:BButton Content="修改售后" Padding="5,0" Margin="5,0,0,0" Background="{StaticResource Text.Pink}"
-                                                                   Visibility="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=已完成:Visible:Collapsed}"
+                                                                   Visibility="{Binding DataContext.IsAfterSaleOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
-                                                                   Command="{Binding DataContext.EditAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                                   Command="{Binding DataContext.FindAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}">
                                                             <c:BButton.CommandParameter>
                                                                 <MultiBinding Converter="{StaticResource mptConverter}">
                                                                     <Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
                                                                     <Binding Path="Id"/>
+                                                                    <Binding Path="DataContext.OrderStartTime" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
                                                                 </MultiBinding>
                                                             </c:BButton.CommandParameter>
                                                         </c:BButton>

BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs

@@ -55,7 +55,8 @@ namespace BBWY.Server.Business
                 PurchaseMethod = aso.PurchaseMethod,
                 PurchaseOrderId = aso.PurchaseOrderId,
                 PurchaseOrderPKId = aso.PurchaseOrderPKId,
-                PurchasePlatform = aso.PurchasePlatform
+                PurchasePlatform = aso.PurchasePlatform,
+                SDRefundFreight = aso.SDRefundFreight
             };
         }
 
@@ -73,7 +74,8 @@ namespace BBWY.Server.Business
                                .WhereIf(request.EndDate != null, (aso, osku, oc) => aso.ApplyTime <= request.EndDate)
                                .WhereIf(!string.IsNullOrEmpty(request.Spu), (aso, osku, oc) => aso.ProductId == request.Spu)
                                .WhereIf(!string.IsNullOrEmpty(request.Sku), (aso, osku, oc) => aso.SkuId == request.Sku)
-                               .WhereIf(!string.IsNullOrEmpty(request.OrderId), (aso, osku, oc) => aso.OrderId == request.OrderId);
+                               .WhereIf(!string.IsNullOrEmpty(request.OrderId), (aso, osku, oc) => aso.OrderId == request.OrderId)
+                               .WhereIf(request.OnlyUnhandle, (aso, osku, oc) => aso.ProductHealth == null || aso.ProductResult == null);
             }
             select = select.Where((aso, osku, oc) => aso.ShopId == request.ShopId)
                            .OrderByDescending((aso, osku, oc) => aso.ApplyTime)
@@ -124,12 +126,20 @@ namespace BBWY.Server.Business
             dbAfterSaleOrder.ReissueProductAmount = 0M;
             dbAfterSaleOrder.StorageAmount = 0M;
             dbAfterSaleOrder.AfterTotalCost = 0M;
+            dbAfterSaleOrder.SDRefundFreight = 0M;
 
             dbAfterSaleOrder.PurchaseMethod = null;
             dbAfterSaleOrder.PurchasePlatform = null;
             dbAfterSaleOrder.PurchaseOrderId = string.Empty;
             dbAfterSaleOrder.PurchaseOrderPKId = null;
 
+            if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.SD退货)
+            {
+                dbAfterSaleOrder.SDRefundFreight = editAfterSaleOrderRequest.SDRefundFreight;
+                dbAfterSaleOrder.AfterTotalCost = editAfterSaleOrderRequest.SDRefundFreight;
+            }
+            else
+            {
                 if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.维修 ||
                    dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.商品补发 ||
                    dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.线下换新)
@@ -154,17 +164,6 @@ namespace BBWY.Server.Business
                     dbAfterSaleOrder.StorageAmount = dbOrderCostDetail.StorageAmount;
                     dbAfterSaleOrder.InStorageAmount = dbOrderCostDetail.InStorageAmount;
                     dbAfterSaleOrder.OutStorageAmount = dbOrderCostDetail.OutStorageAmount;
-
-                //if (dbOrder.StorageType == Model.Enums.StorageType.云仓)
-                //{
-                //    dbAfterSaleOrder.InStorageAmount = 0.2M * dbOrderCostDetail.DeductionQuantity;
-                //    dbAfterSaleOrder.OutStorageAmount = 0.9M * dbOrderCostDetail.DeductionQuantity;
-                //}
-                //else if (dbOrder.StorageType == Model.Enums.StorageType.京仓)
-                //{
-                //    dbAfterSaleOrder.InStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity;  //0.2
-                //    dbAfterSaleOrder.OutStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //2.8
-                //}
                 }
 
                 if ((dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回云仓 || dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回京仓) &&
@@ -175,7 +174,7 @@ namespace BBWY.Server.Business
                 if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.可二次销售)
                 {
                     //原sku采购成本
-                dbAfterSaleOrder.RefundPurchaseAmount = dbOrderCostDetail.TotalCost;
+                    dbAfterSaleOrder.RefundPurchaseAmount = dbOrderCostDetail.SkuAmount; //只退货款
                 }
                 else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.残次品_无法二次销售 ||
                          dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.客户无退货 ||
@@ -203,6 +202,7 @@ namespace BBWY.Server.Business
                                                   dbAfterSaleOrder.ReissueFreight.Value +
                                                   dbAfterSaleOrder.ReissueProductAmount.Value +
                                                   dbAfterSaleOrder.StorageAmount;
+            }
             #endregion
 
             dbOrderCost.CalculationOrderProfitAndCost(dbOrder, afterSaleOrderList);

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -275,7 +275,9 @@ namespace BBWY.Server.Business
                 TotalCost = oct.SDCommissionAmount + oct.PlatformCommissionAmount + oct.PurchaseAmount + oct.DeliveryExpressFreight,
                 //PurchaseOrderIds = ods.PurchaseOrderId,
                 OrderState = o.OrderState.Value,
-                VenderRemark = o.VenderRemark
+                VenderRemark = o.VenderRemark,
+                OrderPayment = o.OrderPayment,
+                OrderSellerPrice = o.OrderSellerPrice
             });
 
             var orderIdList = orderSourceList.Select(o => o.OrderId).ToList();

BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs

@@ -118,7 +118,8 @@ namespace BBWY.Server.Business
                     if (afterOrder.ServiceResult == null ||
                        (afterOrder.ServiceResult != processResult &&
                         afterOrder.ServiceResult != Enums.ServiceResult.维修 &&
-                        afterOrder.ServiceResult != Enums.ServiceResult.仅退款))
+                        afterOrder.ServiceResult != Enums.ServiceResult.仅退款 &&
+                        afterOrder.ServiceResult != Enums.ServiceResult.SD退货))
                     {
                         var update = fsql.Update<AfterSaleOrder>(afterOrder.Id).Set(aso => aso.ServiceResult, processResult);
                         updateAfterSaleOrders.Add(update);

BBWY.Server.Model/Db/Order/AfterSaleOrder.cs

@@ -139,6 +139,11 @@ namespace BBWY.Server.Model.Db
         [Column(DbType = "decimal(20,2)")]
         public decimal StorageAmount { get; set; } = 0.0M;
 
+        /// <summary>
+        /// SD退货运费
+        /// </summary>
+        [Column(DbType = "decimal(18,2)")]
+        public decimal SDRefundFreight { get; set; } = 0.00M;
         /// <summary>
         /// 退款商户订单号
         /// </summary>

BBWY.Server.Model/Dto/Request/AfterSaleOrder/EditAfterSaleOrderRequest.cs

@@ -10,5 +10,10 @@
         public decimal ReissueAfterSaleAmount { get; set; }
         public decimal ReissueFreight { get; set; }
         public decimal ReissueProductAmount { get; set; }
+
+        /// <summary>
+        /// SD退货运费 (模拟买家退货)
+        /// </summary>
+        public decimal SDRefundFreight { get; set; }
     }
 }

BBWY.Server.Model/Dto/Request/AfterSaleOrder/SearchAfterSaleOrderRequest.cs

@@ -23,5 +23,10 @@ namespace BBWY.Server.Model.Dto
         public int PageIndex { get; set; }
 
         public int PageSize { get; set; }
+
+        /// <summary>
+        /// 只包含未处理
+        /// </summary>
+        public bool OnlyUnhandle { get; set; } = false;
     }
 }

BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs

@@ -73,5 +73,20 @@ namespace BBWY.Server.Model.Dto
         public Enums.OrderState OrderState { get; set; }
 
         public string VenderRemark { get; set; }
+
+        /// <summary>
+        /// 订单货款金额
+        /// </summary>
+        public decimal OrderSellerPrice { get; set; }
+
+        /// <summary>
+        /// 实收金额
+        /// </summary>
+        public decimal ActualAmount { get { return OrderSellerPrice + FreightPrice; } }
+
+        /// <summary>
+        /// 用户应付金额
+        /// </summary>
+        public decimal OrderPayment { get; set; }
     }
 }

BBWY.Server.Model/Enums.cs

@@ -122,7 +122,8 @@
             线下换新 = 3,
             维修 = 4,
             商品补发 = 5,
-            仅退款 = 6
+            仅退款 = 6,
+            SD退货 = 7
         }
 
         /// <summary>