diff --git a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs index 4d10386b..3e7a8379 100644 --- a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs @@ -117,5 +117,7 @@ namespace BBWY.Client.Models public string ContactName { get; set; } public string Mobile { get; set; } + + public decimal AfterTotalCost { get; set; } = 0.0M; } } diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs index bd401030..97d069ea 100644 --- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs @@ -69,19 +69,9 @@ namespace BBWY.Client.Models public decimal RefundPurchaseAmount { get; set; } = 0.0M; /// - /// 补发快递费 + /// 售后总成本 /// - public decimal ReissueFreight { get; set; } = 0.00M; - - /// - /// 补发货款成本 - /// - public decimal ReissueProductAmount { get; set; } = 0.00M; - - /// - /// 售后补偿成本 - /// - public decimal ReissueAfterSaleAmount { get; set; } = 0.00M; + public decimal AfterTotalCost { get; set; } = 0.0M; /// /// 成本总计 @@ -92,10 +82,8 @@ namespace BBWY.Client.Models { return SDCommissionAmount + PlatformCommissionAmount + (PurchaseAmount - RefundPurchaseAmount) + - DeliveryExpressFreight + - ReissueFreight + - ReissueProductAmount + - ReissueAfterSaleAmount; + DeliveryExpressFreight + + AfterTotalCost; } } } diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs index e92bd4e3..0c9a3e96 100644 --- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs +++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs @@ -117,5 +117,7 @@ namespace BBWY.Client.Models public string ContactName { get; set; } public string Mobile { get; set; } + + public decimal AfterTotalCost { get; set; } = 0.0M; } } diff --git a/BBWY.Client/Models/Order/OrderCost.cs b/BBWY.Client/Models/Order/OrderCost.cs index f3eb7c5a..d800ec3c 100644 --- a/BBWY.Client/Models/Order/OrderCost.cs +++ b/BBWY.Client/Models/Order/OrderCost.cs @@ -60,24 +60,9 @@ public decimal RefundPurchaseAmount { get; set; } = 0.0M; /// - /// 补发快递费 + /// 售后成本(不含退款采购储层本) /// - public decimal ReissueFreight { get; set; } = 0.00M; - - /// - /// 补发货款成本 - /// - public decimal ReissueProductAmount { get; set; } = 0.00M; - - /// - /// 售后补偿成本 - /// - public decimal ReissueAfterSaleAmount { get; set; } = 0.00M; - - /// - /// 补发总计 - /// - public decimal TotalReissue { get { return ReissueFreight + ReissueProductAmount + ReissueAfterSaleAmount; } } + public decimal AfterTotalCost { get; set; } = 0.00M; /// /// 成本总计 diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs index c7fedcd0..4771758b 100644 --- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs +++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs @@ -53,8 +53,6 @@ namespace BBWY.Server.Business RefundPurchaseAmount = aso.RefundPurchaseAmount, RefundTime = aso.RefundTime, ReissueAfterSaleAmount = aso.ReissueAfterSaleAmount, - ReissueFreight = aso.ReissueFreight, - ReissueProductAmount = aso.ReissueProductAmount, ServiceId = aso.ServiceId, ServiceResult = aso.ServiceResult, ShopId = aso.ShopId, @@ -63,7 +61,8 @@ namespace BBWY.Server.Business ContactName = oc.ContactName, Mobile = oc.Mobile, ItemTotal = osku.ItemTotal.Value, - Price = osku.Price.Value + Price = osku.Price.Value, + AfterTotalCost = aso.AfterTotalCost }); return new AfterSaleOrderListResponse() { diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 82643af8..62c3ceac 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -153,9 +153,7 @@ namespace BBWY.Server.Business SDCommissionAmount = oct.SDCommissionAmount, RefundAmount = oct.RefundAmount, RefundPurchaseAmount = oct.RefundPurchaseAmount, - ReissueAfterSaleAmount = oct.ReissueAfterSaleAmount, - ReissueFreight = oct.ReissueFreight, - ReissueProductAmount = oct.ReissueProductAmount + AfterTotalCost = oct.AfterTotalCost }); var orderList = orderSourceList.Map>(); @@ -357,9 +355,7 @@ namespace BBWY.Server.Business SDCommissionAmount = oct.SDCommissionAmount, RefundAmount = oct.RefundAmount, RefundPurchaseAmount = oct.RefundPurchaseAmount, - ReissueAfterSaleAmount = oct.ReissueAfterSaleAmount, - ReissueFreight = oct.ReissueFreight, - ReissueProductAmount = oct.ReissueProductAmount + AfterTotalCost = oct.AfterTotalCost }); if (order == null) throw new BusinessException("订单不存在"); @@ -1035,9 +1031,9 @@ namespace BBWY.Server.Business dbOrderCost.RefundAmount = afterSaleOrderSkuList.Sum(aso => aso.RefundAmount ?? 0); - dbOrderCost.ReissueProductAmount = afterSaleOrderSkuList.Sum(aso => aso.ReissueProductAmount ?? 0); - dbOrderCost.ReissueFreight = afterSaleOrderSkuList.Sum(aso => aso.ReissueFreight ?? 0); - dbOrderCost.ReissueAfterSaleAmount = afterSaleOrderSkuList.Sum(aso => aso.ReissueAfterSaleAmount ?? 0); + //dbOrderCost.ReissueProductAmount = afterSaleOrderSkuList.Sum(aso => aso.ReissueProductAmount ?? 0); + //dbOrderCost.ReissueFreight = afterSaleOrderSkuList.Sum(aso => aso.ReissueFreight ?? 0); + //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); @@ -1052,9 +1048,7 @@ namespace BBWY.Server.Business (dbOrderCost.PurchaseAmount - dbOrderCost.RefundPurchaseAmount) - dbOrderCost.DeliveryExpressFreight - dbOrderCost.PlatformCommissionAmount - - dbOrderCost.ReissueProductAmount - - dbOrderCost.ReissueFreight - - dbOrderCost.ReissueAfterSaleAmount; + dbOrderCost.AfterTotalCost; updateOrderCost = fsql.Update().SetSource(dbOrderCost).IgnoreColumns(oc => new { oc.CreateTime }); fsql.Transaction(() => diff --git a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs index 11a8458c..7ac6fcf9 100644 --- a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs @@ -57,7 +57,7 @@ namespace BBWY.Server.Business private void SyncJDAfterOrder(JArray afterOrderTokenJArray, ShopResponse shop) { var shopId = long.Parse(shop.ShopId); - var validAfterOrderJArray = afterOrderTokenJArray.Where(j => j.Value("serviceStatus") == 10010 && //完成 + var validAfterOrderJArray = afterOrderTokenJArray.Where(j => (j.Value("serviceStatus") == 10010 || j.Value("serviceStatus") == 10009) && //完成 processResultDic.ContainsKey(j.Value("processResult"))); @@ -155,7 +155,7 @@ namespace BBWY.Server.Business var relayAPIHost = GetPlatformRelayAPIHost(shop.PlatformId); var afterOrderListApiResult = restApiService.SendRequest(relayAPIHost, "api/PlatformSDK/GetAfterOrderList", new SyncAfterOrderRequest() { - StartDate = startTime ?? DateTime.Now.Date.AddDays(-5), + StartDate = startTime ?? DateTime.Now.Date.AddDays(-3), EndDate = endTime ?? DateTime.Now, AppKey = shop.AppKey, AppSecret = shop.AppSecret, diff --git a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs index c98ee04b..322dc8ab 100644 --- a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs +++ b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs @@ -50,18 +50,6 @@ namespace BBWY.Server.Model.Db [Column(DbType = "decimal(20,2)")] public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M; - /// - /// 补发快递费 - /// - [Column(DbType = "decimal(20,2)")] - public decimal? ReissueFreight { get; set; } = 0.00M; - - /// - /// 补发货款成本 - /// - [Column(DbType = "decimal(20,2)")] - public decimal? ReissueProductAmount { get; set; } = 0.00M; - /// /// 服务单处理结果 /// @@ -127,6 +115,12 @@ namespace BBWY.Server.Model.Db [Column(DbType = "int(1)", MapType = typeof(int?))] public Enums.ProductHealth? ProductHealth { get; set; } + /// + /// 服务单的售后成本(不含退款采购成本) + /// + [Column(DbType = "decimal(20,2)")] + public decimal AfterTotalCost { get; set; } = 0.0M; + } } diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs index c781bdcc..aea10f6c 100644 --- a/BBWY.Server.Model/Db/Order/Order.cs +++ b/BBWY.Server.Model/Db/Order/Order.cs @@ -229,28 +229,16 @@ namespace BBWY.Server.Model.Db public decimal RefundAmount { get; set; } = 0.00M; /// - /// 补发快递费 - /// - [Column(IsIgnore = true)] - public decimal ReissueFreight { get; set; } = 0.00M; - - /// - /// 补发货款成本 - /// - [Column(IsIgnore = true)] - public decimal ReissueProductAmount { get; set; } = 0.00M; - - /// - /// 售后补偿成本 + /// 退款采购金额 /// [Column(IsIgnore = true)] - public decimal ReissueAfterSaleAmount { get; set; } = 0.00M; + public decimal RefundPurchaseAmount { get; set; } = 0.0M; /// - /// 退款采购金额 + /// 所有服务单的售后成本(不含退款采购成本) /// [Column(IsIgnore = true)] - public decimal RefundPurchaseAmount { get; set; } = 0.0M; + public decimal AfterTotalCost { get; set; } = 0.0M; #endregion #region 收货人信息 diff --git a/BBWY.Server.Model/Db/Order/OrderCost.cs b/BBWY.Server.Model/Db/Order/OrderCost.cs index b0472db7..33416253 100644 --- a/BBWY.Server.Model/Db/Order/OrderCost.cs +++ b/BBWY.Server.Model/Db/Order/OrderCost.cs @@ -68,28 +68,16 @@ namespace BBWY.Server.Model.Db public decimal RefundAmount { get; set; } = 0.00M; /// - /// 退款采购金额 + /// 退款采购成本 /// [Column(DbType = "decimal(20,2)")] public decimal RefundPurchaseAmount { get; set; } = 0.0M; /// - /// 补发快递费 + /// 所有服务单的售后成本(不含退款采购成本) /// [Column(DbType = "decimal(20,2)")] - public decimal ReissueFreight { get; set; } = 0.00M; - - /// - /// 补发货款成本 - /// - [Column(DbType = "decimal(20,2)")] - public decimal ReissueProductAmount { get; set; } = 0.00M; - - /// - /// 售后补偿成本 - /// - [Column(DbType = "decimal(20,2)")] - public decimal ReissueAfterSaleAmount { get; set; } = 0.00M; + public decimal AfterTotalCost { get; set; } = 0.0M; } } diff --git a/BBWY.Server.Model/MappingProfiles.cs b/BBWY.Server.Model/MappingProfiles.cs index 1e20d8cb..ee2fadbe 100644 --- a/BBWY.Server.Model/MappingProfiles.cs +++ b/BBWY.Server.Model/MappingProfiles.cs @@ -57,9 +57,7 @@ namespace BBWY.Server.Model .ForPath(t => t.OrderCost.SDCommissionAmount, opt => opt.MapFrom(f => f.SDCommissionAmount)) .ForPath(t => t.OrderCost.RefundAmount, opt => opt.MapFrom(f => f.RefundAmount)) .ForPath(t => t.OrderCost.RefundPurchaseAmount, opt => opt.MapFrom(f => f.RefundPurchaseAmount)) - .ForPath(t => t.OrderCost.ReissueAfterSaleAmount, opt => opt.MapFrom(f => f.ReissueAfterSaleAmount)) - .ForPath(t => t.OrderCost.ReissueFreight, opt => opt.MapFrom(f => f.ReissueFreight)) - .ForPath(t => t.OrderCost.ReissueProductAmount, opt => opt.MapFrom(f => f.ReissueProductAmount)); + .ForPath(t => t.OrderCost.AfterTotalCost, opt => opt.MapFrom(f => f.AfterTotalCost)); } }