From 851e9e4b5c3a555523397bc110914e19acf5a2f5 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Thu, 25 Aug 2022 18:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BA=94=E4=BB=98=EF=BC=8C=E5=AE=9E=E6=94=B6=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=20=E6=9C=AA=E5=A1=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=99=E6=8F=90=E7=A4=BA=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=80=80=E6=AC=BE=20=E5=B7=B2=E6=9C=89=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7=EF=BC=8C=E4=BB=85=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BB=85=E6=98=BE=E7=A4=BA=E6=9C=AA=E5=A4=84=E7=90=86?= =?UTF-8?q?=20=E4=BB=A3=E5=8F=91=E8=AE=A2=E5=8D=95=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E5=8E=82=E5=AE=B6=EF=BC=8C=E8=BF=9B=E9=80=80=E8=B4=A7=E6=AC=BE?= =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=8D=95=E5=88=97=E8=A1=A8=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?SD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/APIServices/AfterOrderService.cs | 2 + .../Response/Order/ExportOrderResponse.cs | 19 ++- .../ViewModels/Order/OrderListViewModel.cs | 33 +++- ...ditAfterSaleOrderRefundPurchaseAmount.xaml | 11 +- ...AfterSaleOrderRefundPurchaseAmount.xaml.cs | 7 +- BBWY.Client/Views/Order/OrderList.xaml | 7 +- .../AfterSaleOrder/AfterSaleOrderBusiness.cs | 142 +++++++++--------- BBWY.Server.Business/Order/OrderBusiness.cs | 4 +- .../Sync/AfterSaleOrderSyncBusiness.cs | 3 +- BBWY.Server.Model/Db/Order/AfterSaleOrder.cs | 5 + .../EditAfterSaleOrderRequest.cs | 5 + .../SearchAfterSaleOrderRequest.cs | 5 + .../Dto/Response/Order/ExportOrderResponse.cs | 15 ++ BBWY.Server.Model/Enums.cs | 3 +- 14 files changed, 177 insertions(+), 84 deletions(-) diff --git a/BBWY.Client/APIServices/AfterOrderService.cs b/BBWY.Client/APIServices/AfterOrderService.cs index 1be993b5..181eaaa5 100644 --- a/BBWY.Client/APIServices/AfterOrderService.cs +++ b/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); diff --git a/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs index 56cf9eee..2215dc3f 100644 --- a/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs @@ -74,10 +74,25 @@ namespace BBWY.Client.Models public string VenderRemark { get; set; } + /// + /// 订单货款金额 + /// + public decimal OrderSellerPrice { get; set; } + + /// + /// 实收金额 + /// + public decimal ActualAmount { get; set; } + + /// + /// 用户应付金额 + /// + public decimal OrderPayment { get; set; } + public override string ToString() { - //日期,店铺订单号,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}"; + //日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注 + 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}"; } } } diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 61b6dca1..d08ee82c 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/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); } } + /// + /// 仅显示未处理 + /// + 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(EditAfterSaleOrder); EditAfterSaleOrderRefundPurchaseAmountCommand = new RelayCommand(EditAfterSaleOrderRefundPurchaseAmount); + FindAfterSaleOrderCommand = new RelayCommand(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); + } } } diff --git a/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml b/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml index 67c41893..019fb0ca 100644 --- a/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml +++ b/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml @@ -40,11 +40,16 @@ + Text="{Binding SaleOrder.RefundAlipayOrderNo}" + IsEnabled="{Binding SaleOrder.PurchaseOrderId,ConverterParameter=#null:true:false,Converter={StaticResource objConverter}}" + DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/> + Text="{Binding SaleOrder.RefundMerchantOrderNo}" + IsEnabled="{Binding SaleOrder.PurchaseOrderId,ConverterParameter=#null:true:false,Converter={StaticResource objConverter}}" + DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/> - + - + @@ -439,12 +439,13 @@ + Visibility="{Binding DataContext.IsAfterSaleOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" + Command="{Binding DataContext.FindAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"> + diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs index 9572f16c..3e5088bc 100644 --- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs +++ b/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,85 +126,83 @@ 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.维修 || - dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.商品补发 || - dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.线下换新) + if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.SD退货) { - if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.商品补发) - dbAfterSaleOrder.ProductHealth = Model.Enums.ProductHealth.客户无退货; - - dbAfterSaleOrder.ReissueProductAmount = editAfterSaleOrderRequest.ReissueProductAmount; - - if (dbOrder.StorageType == Model.Enums.StorageType.代发) - dbAfterSaleOrder.ReissueFreight = editAfterSaleOrderRequest.ReissueFreight; //其他单单更新采购运费 - else - dbAfterSaleOrder.DeliveryExpressFreight = editAfterSaleOrderRequest.ReissueFreight; //代发单更新快递费 - } - else if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.换新 && dbOrderCostDetail != null) - { - dbAfterSaleOrder.ConsumableAmount = dbOrderCostDetail.ConsumableAmount; - dbAfterSaleOrder.DeliveryExpressFreight = dbOrderCostDetail.DeliveryExpressFreight; - dbAfterSaleOrder.FirstFreight = dbOrderCostDetail.FirstFreight; - dbAfterSaleOrder.ReissueProductAmount = dbOrderCostDetail.SkuAmount; - dbAfterSaleOrder.ReissueFreight = dbOrderCostDetail.PurchaseFreight; - 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.退回京仓) && - dbOrderCostDetail != null && - dbPurchaseOrder != null) - dbAfterSaleOrder.RefundInStorageAmount = dbPurchaseOrder.SingleRefundInStorageAmount * dbOrderCostDetail.DeductionQuantity; - - if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.可二次销售) - { - //原sku采购成本 - dbAfterSaleOrder.RefundPurchaseAmount = dbOrderCostDetail.TotalCost; - } - else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.残次品_无法二次销售 || - dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.客户无退货 || - dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.破损) - { - dbAfterSaleOrder.RefundPurchaseAmount = 0M; + dbAfterSaleOrder.SDRefundFreight = editAfterSaleOrderRequest.SDRefundFreight; + dbAfterSaleOrder.AfterTotalCost = editAfterSaleOrderRequest.SDRefundFreight; } - else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 && - dbOrderCostDetail != null && - dbPurchaseOrder != null) + else { - dbAfterSaleOrder.PurchaseMethod = dbPurchaseOrder.PurchaseMethod; - dbAfterSaleOrder.PurchasePlatform = dbPurchaseOrder.PurchasePlatform; - dbAfterSaleOrder.PurchaseOrderId = dbPurchaseOrder.PurchaseOrderId; - dbAfterSaleOrder.PurchaseOrderPKId = dbPurchaseOrder.Id; + if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.维修 || + dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.商品补发 || + dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.线下换新) + { + if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.商品补发) + dbAfterSaleOrder.ProductHealth = Model.Enums.ProductHealth.客户无退货; + + dbAfterSaleOrder.ReissueProductAmount = editAfterSaleOrderRequest.ReissueProductAmount; + + if (dbOrder.StorageType == Model.Enums.StorageType.代发) + dbAfterSaleOrder.ReissueFreight = editAfterSaleOrderRequest.ReissueFreight; //其他单单更新采购运费 + else + dbAfterSaleOrder.DeliveryExpressFreight = editAfterSaleOrderRequest.ReissueFreight; //代发单更新快递费 + } + else if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.换新 && dbOrderCostDetail != null) + { + dbAfterSaleOrder.ConsumableAmount = dbOrderCostDetail.ConsumableAmount; + dbAfterSaleOrder.DeliveryExpressFreight = dbOrderCostDetail.DeliveryExpressFreight; + dbAfterSaleOrder.FirstFreight = dbOrderCostDetail.FirstFreight; + dbAfterSaleOrder.ReissueProductAmount = dbOrderCostDetail.SkuAmount; + dbAfterSaleOrder.ReissueFreight = dbOrderCostDetail.PurchaseFreight; + dbAfterSaleOrder.StorageAmount = dbOrderCostDetail.StorageAmount; + dbAfterSaleOrder.InStorageAmount = dbOrderCostDetail.InStorageAmount; + dbAfterSaleOrder.OutStorageAmount = dbOrderCostDetail.OutStorageAmount; + } + + if ((dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回云仓 || dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回京仓) && + dbOrderCostDetail != null && + dbPurchaseOrder != null) + dbAfterSaleOrder.RefundInStorageAmount = dbPurchaseOrder.SingleRefundInStorageAmount * dbOrderCostDetail.DeductionQuantity; + + if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.可二次销售) + { + //原sku采购成本 + dbAfterSaleOrder.RefundPurchaseAmount = dbOrderCostDetail.SkuAmount; //只退货款 + } + else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.残次品_无法二次销售 || + dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.客户无退货 || + dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.破损) + { + dbAfterSaleOrder.RefundPurchaseAmount = 0M; + } + else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 && + dbOrderCostDetail != null && + dbPurchaseOrder != null) + { + dbAfterSaleOrder.PurchaseMethod = dbPurchaseOrder.PurchaseMethod; + dbAfterSaleOrder.PurchasePlatform = dbPurchaseOrder.PurchasePlatform; + dbAfterSaleOrder.PurchaseOrderId = dbPurchaseOrder.PurchaseOrderId; + dbAfterSaleOrder.PurchaseOrderPKId = dbPurchaseOrder.Id; + } + + dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value + + dbAfterSaleOrder.ConsumableAmount.Value + + dbAfterSaleOrder.DeliveryExpressFreight.Value + + dbAfterSaleOrder.FirstFreight.Value + + dbAfterSaleOrder.InStorageAmount.Value + + dbAfterSaleOrder.OutStorageAmount.Value + + dbAfterSaleOrder.RefundInStorageAmount.Value + + dbAfterSaleOrder.ReissueFreight.Value + + dbAfterSaleOrder.ReissueProductAmount.Value + + dbAfterSaleOrder.StorageAmount; } - - dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value + - dbAfterSaleOrder.ConsumableAmount.Value + - dbAfterSaleOrder.DeliveryExpressFreight.Value + - dbAfterSaleOrder.FirstFreight.Value + - dbAfterSaleOrder.InStorageAmount.Value + - dbAfterSaleOrder.OutStorageAmount.Value + - dbAfterSaleOrder.RefundInStorageAmount.Value + - dbAfterSaleOrder.ReissueFreight.Value + - dbAfterSaleOrder.ReissueProductAmount.Value + - dbAfterSaleOrder.StorageAmount; #endregion dbOrderCost.CalculationOrderProfitAndCost(dbOrder, afterSaleOrderList); diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index bdc9bc05..8b8abd5a 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/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(); diff --git a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs index 7ac6fcf9..6718f7fb 100644 --- a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs +++ b/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(afterOrder.Id).Set(aso => aso.ServiceResult, processResult); updateAfterSaleOrders.Add(update); diff --git a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs index df849951..588c3118 100644 --- a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs +++ b/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; + /// + /// SD退货运费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal SDRefundFreight { get; set; } = 0.00M; /// /// 退款商户订单号 /// diff --git a/BBWY.Server.Model/Dto/Request/AfterSaleOrder/EditAfterSaleOrderRequest.cs b/BBWY.Server.Model/Dto/Request/AfterSaleOrder/EditAfterSaleOrderRequest.cs index a45ea28f..b676b15c 100644 --- a/BBWY.Server.Model/Dto/Request/AfterSaleOrder/EditAfterSaleOrderRequest.cs +++ b/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; } + + /// + /// SD退货运费 (模拟买家退货) + /// + public decimal SDRefundFreight { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Request/AfterSaleOrder/SearchAfterSaleOrderRequest.cs b/BBWY.Server.Model/Dto/Request/AfterSaleOrder/SearchAfterSaleOrderRequest.cs index aa67f3e7..3515db9f 100644 --- a/BBWY.Server.Model/Dto/Request/AfterSaleOrder/SearchAfterSaleOrderRequest.cs +++ b/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; } + + /// + /// 只包含未处理 + /// + public bool OnlyUnhandle { get; set; } = false; } } diff --git a/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs index 3b061ca2..2c892b8f 100644 --- a/BBWY.Server.Model/Dto/Response/Order/ExportOrderResponse.cs +++ b/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; } + + /// + /// 订单货款金额 + /// + public decimal OrderSellerPrice { get; set; } + + /// + /// 实收金额 + /// + public decimal ActualAmount { get { return OrderSellerPrice + FreightPrice; } } + + /// + /// 用户应付金额 + /// + public decimal OrderPayment { get; set; } } } diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index bbd51415..ffd28f66 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -122,7 +122,8 @@ 线下换新 = 3, 维修 = 4, 商品补发 = 5, - 仅退款 = 6 + 仅退款 = 6, + SD退货 = 7 } ///