From 441ffc8f2d4b3c3b7600ca18a1b1674a279e8779 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Fri, 19 Aug 2022 23:41:23 +0800 Subject: [PATCH] 1 --- .../AfterSaleOrder/AfterSaleOrderBusiness.cs | 45 ++++++++++--------- BBWY.Server.Business/Order/OrderBusiness.cs | 12 +++-- .../PurchaseOrder/PurchaseOrderBusiness.cs | 30 +++++++++++-- .../Sync/OrderSyncBusiness.cs | 12 ++--- .../Db/PurchaseOrder/PurchaseOrder.cs | 8 +++- .../PurchaseOrder/AddPurchaseOrderRequest.cs | 23 +++++++--- .../PurchaseOrder/EditPurchaseOrderRequest.cs | 16 ++++--- 7 files changed, 102 insertions(+), 44 deletions(-) diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs index 2e100968..80a0a9f6 100644 --- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs +++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs @@ -105,6 +105,7 @@ namespace BBWY.Server.Business var dbOrderCostDetail = fsql.Select().Where(ocd => ocd.OrderId == editAfterSaleOrderRequest.OrderId && ocd.SkuId == dbAfterSaleOrder.SkuId && ocd.IsEnabled == true).ToOne(); + var dbPurchaseOrder = fsql.Select(dbOrderCostDetail.PurchaseOrderPKId).ToOne(); var dbOrderCost = fsql.Select(editAfterSaleOrderRequest.OrderId).ToOne(); #region 更新当前服务单属性 @@ -151,20 +152,24 @@ namespace BBWY.Server.Business dbAfterSaleOrder.ReissueProductAmount = dbOrderCostDetail.SkuAmount; dbAfterSaleOrder.ReissueFreight = dbOrderCostDetail.PurchaseFreight; dbAfterSaleOrder.StorageAmount = dbOrderCostDetail.StorageAmount; - 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 - } + 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.退回京仓) - dbAfterSaleOrder.RefundInStorageAmount = 1M; + 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.可二次销售) { @@ -177,16 +182,14 @@ namespace BBWY.Server.Business { dbAfterSaleOrder.RefundPurchaseAmount = 0M; } - else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 && dbOrderCostDetail != null) + else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 && + dbOrderCostDetail != null && + dbPurchaseOrder != null) { - var po = fsql.Select(dbOrderCostDetail.PurchaseOrderPKId).ToOne(); - if (po != null) - { - dbAfterSaleOrder.PurchaseMethod = po.PurchaseMethod; - dbAfterSaleOrder.PurchasePlatform = po.PurchasePlatform; - dbAfterSaleOrder.PurchaseOrderId = po.PurchaseOrderId; - dbAfterSaleOrder.PurchaseOrderPKId = po.Id; - } + dbAfterSaleOrder.PurchaseMethod = dbPurchaseOrder.PurchaseMethod; + dbAfterSaleOrder.PurchasePlatform = dbPurchaseOrder.PurchasePlatform; + dbAfterSaleOrder.PurchaseOrderId = dbPurchaseOrder.PurchaseOrderId; + dbAfterSaleOrder.PurchaseOrderPKId = dbPurchaseOrder.Id; } dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value + diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 522d94e5..f0da8cbb 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -532,7 +532,9 @@ namespace BBWY.Server.Business TotalCost = currentPurchaseAmount, ConsumableAmount = purchaseOrder.SingleConsumableAmount * deductionQuantity, FirstFreight = purchaseOrder.SingleFirstFreight * deductionQuantity, - OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity, + InStorageAmount = purchaseOrder.SingleInStorageAmount * deductionQuantity, + OutStorageAmount = purchaseOrder.SingleOutStorageAmount * deductionQuantity, + //OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity, PurchaseFreight = purchaseOrder.SingleFreight * deductionQuantity, SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity, StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity @@ -823,7 +825,9 @@ namespace BBWY.Server.Business SingleConsumableAmount = 0, SingleFirstFreight = 0, SingleFreight = odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count() / relationOrderSku.Quantity, - SingleOperationAmount = 0, + //SingleOperationAmount = 0, + SingleInStorageAmount = 0, + SingleOutStorageAmount = 0, SingleStorageAmount = 0, SingleSkuAmount = relationOrderSku.SingleSkuAmount, SingleDeliveryFreight = 0 @@ -840,7 +844,9 @@ namespace BBWY.Server.Business DeductionQuantity = relationOrderSku.Quantity, DeliveryExpressFreight = 0, FirstFreight = 0, - OperationAmount = 0, + //OperationAmount = 0, + InStorageAmount = 0, + OutStorageAmount = 0, OrderId = dbOrder.Id, ProductId = relationOrderSku.ProductId, PurchaseFreight = odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(), diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 1f289e8f..2e514922 100644 --- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -65,6 +65,25 @@ namespace BBWY.Server.Business var purchaseOrder = addPurchaseOrderRequest.Map(); purchaseOrder.Id = idGenerator.NewLong(); purchaseOrder.CreateTime = DateTime.Now; + if (purchaseOrder.StorageType == Enums.StorageType.京仓) + { + if (purchaseOrder.SingleInStorageAmount == 0M) + purchaseOrder.SingleInStorageAmount = 0.2M; + if (purchaseOrder.SingleOutStorageAmount == 0M) + purchaseOrder.SingleOutStorageAmount = 2.8M; + if (purchaseOrder.SingleRefundInStorageAmount == 0M) + purchaseOrder.SingleRefundInStorageAmount = 2.8M; + } + if (purchaseOrder.StorageType == Enums.StorageType.云仓) + { + if (purchaseOrder.SingleInStorageAmount == 0M) + purchaseOrder.SingleInStorageAmount = 0.2M; + if (purchaseOrder.SingleOutStorageAmount == 0M) + purchaseOrder.SingleOutStorageAmount = 0.9M; + if (purchaseOrder.SingleRefundInStorageAmount == 0M) + purchaseOrder.SingleRefundInStorageAmount = 1M; + } + fsql.Insert(purchaseOrder).ExecuteAffrows(); } @@ -75,7 +94,8 @@ namespace BBWY.Server.Business .Set(po => po.SingleSkuAmount, editPurchaseOrderRequest.SingleSkuAmount) .Set(po => po.SingleFreight, editPurchaseOrderRequest.SingleFreight) .Set(po => po.SingleFirstFreight, editPurchaseOrderRequest.SingleFirstFreight) - .Set(po => po.SingleOperationAmount, editPurchaseOrderRequest.SingleOperationAmount) + .Set(po => po.SingleInStorageAmount, editPurchaseOrderRequest.SingleInStorageAmount) + .Set(po => po.SingleOutStorageAmount, editPurchaseOrderRequest.SingleOutStorageAmount) .Set(po => po.SingleConsumableAmount, editPurchaseOrderRequest.SingleConsumableAmount) .Set(po => po.SingleStorageAmount, editPurchaseOrderRequest.SingleStorageAmount) .Set(po => po.SingleDeliveryFreight, editPurchaseOrderRequest.SingleDeliveryFreight) @@ -188,7 +208,9 @@ namespace BBWY.Server.Business SingleDeliveryFreight = 0, SingleFirstFreight = 0, SingleStorageAmount = 0, - SingleOperationAmount = 0, + //SingleOperationAmount = 0, + SingleOutStorageAmount = 0, + SingleInStorageAmount = 0, SingleSkuAmount = currentOrderSkuProductAmount / orderSku.ItemTotal.Value, SingleFreight = currentOrderSkuFreightAmount / orderSku.ItemTotal.Value, StorageType = Enums.StorageType.代发, @@ -217,7 +239,9 @@ namespace BBWY.Server.Business DeductionQuantity = orderSku.ItemTotal.Value, DeliveryExpressFreight = 0, FirstFreight = 0, - OperationAmount = 0, + //OperationAmount = 0, + InStorageAmount = 0, + OutStorageAmount = 0, OrderId = createOnlinePurchaseOrderRequest.OrderId, ProductId = orderSku.ProductId, PurchaseFreight = currentOrderSkuFreightAmount, diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs index 52270020..4b9486f4 100644 --- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs @@ -29,11 +29,11 @@ namespace BBWY.Server.Business IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness) : base(restApiService, - options, - logger, - fsql, + options, + logger, + fsql, idGenerator, - taskSchedulerManager, + taskSchedulerManager, venderBusiness) { syncOrderMethodDic = new Dictionary>() @@ -468,7 +468,9 @@ namespace BBWY.Server.Business TotalCost = currentPurchaseAmount, ConsumableAmount = purchaseOrder.SingleConsumableAmount * deductionQuantity, FirstFreight = purchaseOrder.SingleFirstFreight * deductionQuantity, - OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity, + //OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity, + InStorageAmount = purchaseOrder.SingleInStorageAmount * deductionQuantity, + OutStorageAmount = purchaseOrder.SingleOutStorageAmount * deductionQuantity, PurchaseFreight = purchaseOrder.SingleFreight * deductionQuantity, SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity, StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs index da86d9c0..af005148 100644 --- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs +++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs @@ -124,6 +124,12 @@ namespace BBWY.Server.Model.Db [Column(DbType = "decimal(20,2)")] public decimal SingleOutStorageAmount { get; set; } = 0.00M; + /// + /// 退货入仓操作费 + /// + [Column(DbType = "decimal(20,2)")] + public decimal SingleRefundInStorageAmount { get; set; } = 0.00M; + /// /// 单件耗材费 /// @@ -151,7 +157,7 @@ namespace BBWY.Server.Model.Db { get { - return SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleOperationAmount + SingleConsumableAmount + SingleStorageAmount; + return SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleInStorageAmount + SingleOutStorageAmount + SingleConsumableAmount + SingleStorageAmount; } } } diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/AddPurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/AddPurchaseOrderRequest.cs index bd6d51b6..e1721e81 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/AddPurchaseOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/AddPurchaseOrderRequest.cs @@ -4,7 +4,7 @@ { public long ShopId { get; set; } - + public string ProductId { get; set; } /// @@ -55,11 +55,6 @@ /// public decimal SingleFirstFreight { get; set; } - /// - /// 单件操作费 - /// - public decimal SingleOperationAmount { get; set; } = 0.00M; - /// /// 单件耗材费 /// @@ -74,5 +69,21 @@ /// 单件销售运费(不参与均价计算) /// public decimal SingleDeliveryFreight { get; set; } + + + /// + /// 单件入仓操作费 + /// + public decimal SingleInStorageAmount { get; set; } = 0.00M; + + /// + /// 单件出仓操作费 + /// + public decimal SingleOutStorageAmount { get; set; } = 0.00M; + + /// + /// 退货入仓操作费 + /// + public decimal SingleRefundInStorageAmount { get; set; } = 0.00M; } } diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs index 031dd715..c2bfeab0 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs @@ -29,11 +29,6 @@ /// public decimal SingleFirstFreight { get; set; } = 0.00M; - /// - /// 单件操作费 - /// - public decimal SingleOperationAmount { get; set; } = 0.00M; - /// /// 单件耗材费 /// @@ -48,5 +43,16 @@ /// 单件销售运费(不参与均价计算) /// public decimal SingleDeliveryFreight { get; set; } = 0.00M; + + + /// + /// 单件入仓操作费 + /// + public decimal SingleInStorageAmount { get; set; } = 0.00M; + + /// + /// 单件出仓操作费 + /// + public decimal SingleOutStorageAmount { get; set; } = 0.00M; } } \ No newline at end of file