From 0cb4e2b7b76a4a5fef80d5db89178cecee0eb64f Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 30 Jul 2023 13:56:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95Sku?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E9=80=BB=E8=BE=91=20=20=201.1=20=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=87=87=E8=B4=AD=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95Sku=E6=88=90=E6=9C=AC=20=20=201.2=20=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?Sku=E6=88=90=E6=9C=AC=20=20=201.3=20=E8=AE=BE=E7=BD=AE=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E9=87=87=E8=B4=AD=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95Sku=E6=88=90=E6=9C=AC=20=20=201.4=201688=E6=94=B9?= =?UTF-8?q?=E4=BB=B7=E9=80=9A=E7=9F=A5,=E4=BB=98=E6=AC=BE=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95Sku=E6=88=90?= =?UTF-8?q?=E6=9C=AC=20=20=201.5=20=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3,=20=E5=9C=A8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=88=90=E6=9C=AC=E5=B1=82=E8=BF=94=E5=9B=9E=E8=AE=A2?= =?UTF-8?q?=E5=8D=95Sku=E6=88=90=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PurchaseOrderController.cs | 3 +- .../Extensions/OrderAmountExtension.cs | 83 +++- BBWYB.Server.Business/Order/OrderBusiness.cs | 46 ++- .../PurchaseOrder/PurchaseOrderBusiness.cs | 389 ++++++++++++------ .../Db/Order/{ => Cost}/OrderCost.cs | 0 .../Db/Order/{ => Cost}/OrderCostDetail.cs | 0 .../Db/Order/Cost/OrderSkuCost.cs | 62 +++ .../SetHistoryPurchaseOrderRequest.cs | 2 + .../Dto/Response/Order/OrderCostResponse.cs | 2 +- .../Response/Order/OrderSkuCostResponse.cs | 9 + .../Dto/Response/Order/OrderSkuResponse.cs | 5 - 11 files changed, 434 insertions(+), 167 deletions(-) rename BBWYB.Server.Model/Db/Order/{ => Cost}/OrderCost.cs (100%) rename BBWYB.Server.Model/Db/Order/{ => Cost}/OrderCostDetail.cs (100%) create mode 100644 BBWYB.Server.Model/Db/Order/Cost/OrderSkuCost.cs create mode 100644 BBWYB.Server.Model/Dto/Response/Order/OrderSkuCostResponse.cs diff --git a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs index 877a32b..35b8645 100644 --- a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs @@ -98,7 +98,8 @@ namespace BBWYB.Server.API.Controllers [HttpDelete] public void DeletePurchaseOrder([FromBody] DeletePurchaseOrderRequest request) { - purchaseOrderBusiness.DeletePurchaseOrder(request); + request.IsDelete = true; + purchaseOrderBusiness.SetHistoryPurchaseOrder(request); } /// diff --git a/BBWYB.Server.Business/Extensions/OrderAmountExtension.cs b/BBWYB.Server.Business/Extensions/OrderAmountExtension.cs index b5becfd..4538bae 100644 --- a/BBWYB.Server.Business/Extensions/OrderAmountExtension.cs +++ b/BBWYB.Server.Business/Extensions/OrderAmountExtension.cs @@ -8,17 +8,11 @@ namespace BBWYB.Server.Business.Extensions /// 计算订单sku明细的成本和利润 /// /// 订单SKU明细成本对象 - /// sku商品金额(收入) - /// sku买家支付运费(收入) - /// sku实收打包费(收入) /// sku采购货款(支出) /// sku采购运费(支出) /// sku支出打包费(支出) /// sku发货运费(支出) public static void CalculationOrderCostDetailCostAndProfit(this OrderCostDetail ocd, - decimal skuProductAmount, - decimal skuBuyerPayFreight, - decimal skuInPackAmount, decimal skuPurchaseProductAmount, decimal skuPurchaseFreight, decimal skuOutPackAmount, @@ -29,7 +23,50 @@ namespace BBWYB.Server.Business.Extensions ocd.OutPackAmount = skuOutPackAmount; ocd.DeliveryExpressFreight = skuDeliveryExpressFreight; ocd.TotalCost = ocd.SkuAmount + ocd.PurchaseFreight + ocd.OutPackAmount + ocd.DeliveryExpressFreight; //采购货款+采购运费+支出打包费+发货运费 - ocd.Profit = skuProductAmount + skuBuyerPayFreight + skuInPackAmount - ocd.TotalCost; //SKU货款+买家支付运费+SKU打包费 - SKU总成本 + //ocd.Profit = skuProductAmount + skuBuyerPayFreight + skuInPackAmount - ocd.TotalCost; //SKU货款+买家支付运费+SKU打包费 - SKU总成本 + } + + /// + /// 计算订单sku成本和利润 + /// + /// 订单SKU明细成本对象 + /// sku商品金额(收入) + /// sku买家支付运费(收入) + /// sku实收打包费(收入) + /// 订单成本明细列表 + public static void CalculationOrderSkuCostAndProfit(this OrderSkuCost orderSkuCost, + decimal skuProductAmount, + decimal skuBuyerPayFreight, + decimal skuInPackAmount, + IList orderCostDetailList) + { + var currentSkuCostDetailList = orderCostDetailList.Where(ocd => ocd.SkuId == orderSkuCost.SkuId && ocd.IsEnabled == true).ToList(); + + orderSkuCost.SkuAmount = currentSkuCostDetailList.Sum(ocd => ocd.SkuAmount); + orderSkuCost.PurchaseFreight = currentSkuCostDetailList.Sum(ocd => ocd.PurchaseFreight); + orderSkuCost.OutPackAmount = currentSkuCostDetailList.Sum(ocd => ocd.OutPackAmount); + orderSkuCost.DeliveryExpressFreight = currentSkuCostDetailList.Sum(ocd => ocd.DeliveryExpressFreight); + orderSkuCost.TotalCost = orderSkuCost.SkuAmount + + orderSkuCost.PurchaseFreight + + orderSkuCost.OutPackAmount + + orderSkuCost.DeliveryExpressFreight; //采购货款+采购运费+支出打包费+发货运费 + orderSkuCost.Profit = skuProductAmount + skuBuyerPayFreight + skuInPackAmount - orderSkuCost.TotalCost; //SKU货款+买家支付运费+SKU打包费 - SKU总成本 + } + + /// + /// 计算订单sku成本和利润 + /// + /// + /// + /// + public static void CalculationOrderSkuCostAndProfit(this OrderSkuCost orderSkuCost, + OrderSku orderSku, + IList orderCostDetailList) + { + orderSkuCost.CalculationOrderSkuCostAndProfit((orderSku.ItemTotal * orderSku.Price) ?? 0M, + orderSku.BuyerPayFreight ?? 0M, + orderSku.InPackAmount ?? 0M, + orderCostDetailList); } /// @@ -41,12 +78,12 @@ namespace BBWYB.Server.Business.Extensions /// 采购运费 /// 支出打包费 /// 发货运费 - public static void CalculationOrderCostCostAndProfit(this OrderCost oc, - decimal orderAmount, - decimal purchaseProductAmount, - decimal purchaseFreight, - decimal outPackAmount, - decimal deliveryExpressFreight) + public static void CalculationOrderCostAndProfit(this OrderCost oc, + decimal orderAmount, + decimal purchaseProductAmount, + decimal purchaseFreight, + decimal outPackAmount, + decimal deliveryExpressFreight) { oc.PurchaseAmount = purchaseProductAmount + purchaseFreight; //兼容以前 @@ -57,5 +94,25 @@ namespace BBWYB.Server.Business.Extensions oc.TotalCost = oc.SkuAmount + oc.PurchaseFreight + oc.OutPackAmount + oc.DeliveryExpressFreight; oc.Profit = orderAmount - oc.TotalCost; } + + /// + /// 计算订单的成本和利润 + /// + /// + /// + /// + public static void CalculationOrderCostAndProfit(this OrderCost oc, + decimal orderAmount, + IList orderSkuCostList) + { + var currentOrderSkuCostList = orderSkuCostList.Where(osc => osc.OrderId == oc.OrderId).ToList(); + oc.SkuAmount = currentOrderSkuCostList.Sum(osc => osc.SkuAmount); + oc.PurchaseFreight = currentOrderSkuCostList.Sum(osc => osc.PurchaseFreight); + oc.PurchaseAmount = oc.SkuAmount + oc.PurchaseFreight; //兼容以前 + oc.OutPackAmount = currentOrderSkuCostList.Sum(osc => osc.OutPackAmount); + oc.DeliveryExpressFreight = currentOrderSkuCostList.Sum(osc => osc.DeliveryExpressFreight); + oc.TotalCost = oc.SkuAmount + oc.PurchaseFreight + oc.OutPackAmount + oc.DeliveryExpressFreight; + oc.Profit = orderAmount - oc.TotalCost; + } } } diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 939cb7f..4761bf8 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -263,9 +263,23 @@ namespace BBWYB.Server.Business order.OrderCostDetailList = orderCostDetailList.Where(ocd => ocd.OrderId == order.Id).ToList(); #endregion + #region 处理订单Sku成本 + var orderSkuCostList = fsql.Select().Where(osc => orderIdList.Contains(osc.OrderId)).ToList(); + foreach (var order in orderList) + { + if (order.OrderCost == null) + continue; + order.OrderCost.OrderSkuCostList = orderSkuCostList.Where(osc => osc.OrderId == order.Id).ToList(); + foreach (var orderSkuCost in order.OrderCost.OrderSkuCostList) + { + orderSkuCost.OrderCostDetailList = orderCostDetailList.Where(ocd => ocd.OrderId == order.Id && ocd.SkuId == orderSkuCost.SkuId).ToList(); + } + } + #endregion + #region 处理采购信息 var orderPurchaseInfoList = fsql.Select().Where(op => orderIdList.Contains(op.OrderId) && op.IsEnabled == true).ToList(); - var purchaserIdList = orderPurchaseInfoList.Where(opi=>!string.IsNullOrEmpty(opi.PurchaserId)).Select(opi => opi.PurchaserId).Distinct().ToList(); + var purchaserIdList = orderPurchaseInfoList.Where(opi => !string.IsNullOrEmpty(opi.PurchaserId)).Select(opi => opi.PurchaserId).Distinct().ToList(); var orderPurchaseSkuInfoList = fsql.Select().Where(o => orderIdList.Contains(o.OrderId)).ToList(); foreach (var order in orderList) { @@ -559,10 +573,12 @@ namespace BBWYB.Server.Business var order = orderListResponse.Items.FirstOrDefault(); var orderCost = fsql.Select(request.OrderId).ToOne(); + var orderSkuCostList = fsql.Select().Where(osc => osc.OrderId == request.OrderId).ToList(); var orderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId && ocd.IsEnabled == true).ToList(); IList> updates_orderSku = new List>(); IUpdate updateOrderCost = null; + IList> updateOrderSkuCostList = new List>(); IList> updateOrderCostDetailList = new List>(); @@ -577,25 +593,32 @@ namespace BBWYB.Server.Business { foreach (var orderCostDetail in ocdList) { - orderCostDetail.CalculationOrderCostDetailCostAndProfit(orderSku.SkuPrice * orderSku.Quantity, - orderSku.FreightAmount, - orderSku.PackAmount, - orderCostDetail.SkuAmount ?? 0M, + orderCostDetail.CalculationOrderCostDetailCostAndProfit(orderCostDetail.SkuAmount ?? 0M, orderCostDetail.PurchaseFreight ?? 0M, orderCostDetail.OutPackAmount ?? 0M, orderCostDetail.DeliveryExpressFreight ?? 0M); updateOrderCostDetailList.Add(fsql.Update(orderCostDetail.Id).Set(ocd => ocd.Profit, orderCostDetail.Profit)); } } + + var orderSkuCost = orderSkuCostList.FirstOrDefault(osc => osc.SkuId == orderSku.SkuId); + if (orderSkuCost != null) + { + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku.SkuPrice * orderSku.Quantity, + orderSku.FreightAmount, + orderSku.PackAmount, + ocdList); + updateOrderSkuCostList.Add(fsql.Update(orderSkuCost.Id).Set(osc => osc.Profit, orderSkuCost.Profit)); + } } if (orderCost != null) { - orderCost.CalculationOrderCostCostAndProfit(order.OrderTotalAmount, - orderCost.SkuAmount ?? 0M, - orderCost.PurchaseFreight ?? 0M, - orderCost.OutPackAmount ?? 0M, - orderCost.DeliveryExpressFreight ?? 0M); + orderCost.CalculationOrderCostAndProfit(order.OrderTotalAmount, + orderCost.SkuAmount ?? 0M, + orderCost.PurchaseFreight ?? 0M, + orderCost.OutPackAmount ?? 0M, + orderCost.DeliveryExpressFreight ?? 0M); updateOrderCost = fsql.Update().SetSource(orderCost); } @@ -619,6 +642,9 @@ namespace BBWYB.Server.Business foreach (var update in updateOrderCostDetailList) update.ExecuteAffrows(); } + if (updateOrderSkuCostList.Count() > 0) + foreach (var update in updateOrderSkuCostList) + update.ExecuteAffrows(); }); #region 通知C端 diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index d86c16c..68f02ff 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -262,6 +262,8 @@ namespace BBWYB.Server.Business var orderSkus = fsql.Select().Where(osku => osku.OrderId == request.OrderId).ToList(); var orderPurchaseInfoList = fsql.Select().Where(opi => opi.OrderId == request.OrderId && opi.IsEnabled == true).ToList(); var orderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId && ocd.IsEnabled == true).ToList(); + var orderSkuCostList = fsql.Select().Where(osc => osc.OrderId == request.OrderId).ToList(); + foreach (var cargoParamGroup in request.CargoParamGroupList) { @@ -291,19 +293,10 @@ namespace BBWYB.Server.Business if (dbOrder.IntoStoreType == Enums.IntoStoreType.发回齐越) notifyQikuPackSchemeParamList = new List(); - //#region 待更新 - //IList updateOrderCostDetailIdList = fsql.Select() - // .Where(ocd => ocd.OrderId == request.OrderId && ocd.IsEnabled == true) - // .ToList(ocd => ocd.Id); - //IList updatePurchaseOrderIdList = fsql.Select() - // .Where(opi => opi.OrderId == request.OrderId && opi.IsEnabled == true) - // .ToList(opi => opi.Id); - //#endregion - IInsert insertOrderCost = null; IUpdate updateOrderCost = null; - //var totalPurchaseProductAmount = 0M; - //var totalPurchaseFreight = 0M; + List insertOrderSkuCostList = new List(); + IList> updateOrderSkuCostList = new List>(); foreach (var cargoParamGroup in request.CargoParamGroupList) { @@ -412,10 +405,7 @@ namespace BBWYB.Server.Business SkuId = belongSkuId, IsEnabled = true }; - orderCostDetail.CalculationOrderCostDetailCostAndProfit(orderSku.Price.Value * orderSku.ItemTotal.Value, - orderSku.BuyerPayFreight ?? 0M, - orderSku.InPackAmount ?? 0M, - currentSkuAmount, + orderCostDetail.CalculationOrderCostDetailCostAndProfit(currentSkuAmount, currentPurchaseFreight, 0M, 0M); @@ -494,6 +484,32 @@ namespace BBWYB.Server.Business #endregion } + #region 订单Sku成本 + var allOrderCostDetail = orderCostDetailList.Union(insertOrderCostDetails).ToList(); + foreach (var orderSku in orderSkus) + { + var orderSkuCost = orderSkuCostList.FirstOrDefault(osc => osc.SkuId == orderSku.SkuId); + if (orderSkuCost == null) + { + orderSkuCost = new OrderSkuCost() + { + Id = idGenerator.NewLong(), + CreateTime = DateTime.Now, + OrderId = request.OrderId, + SkuId = orderSku.SkuId + }; + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, allOrderCostDetail); + insertOrderSkuCostList.Add(orderSkuCost); + } + else + { + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, allOrderCostDetail); + var update = fsql.Update().SetSource(orderSkuCost); + updateOrderSkuCostList.Add(update); + } + } + #endregion + #region 订单成本 var orderCost = new OrderCost() { @@ -502,13 +518,15 @@ namespace BBWYB.Server.Business IsManualEdited = false }; - var totalPurchaseProductAmount = orderCostDetailList.Union(insertOrderCostDetails).Sum(ocd => ocd.SkuAmount); - var totalPurchaseFreight = orderCostDetailList.Union(insertOrderCostDetails).Sum(ocd => ocd.PurchaseFreight); - orderCost.CalculationOrderCostCostAndProfit(dbOrder.OrderTotalPrice.Value, - totalPurchaseProductAmount ?? 0M, - totalPurchaseFreight ?? 0M, - 0M, - 0M); + //var totalPurchaseProductAmount = orderCostDetailList.Union(insertOrderCostDetails).Sum(ocd => ocd.SkuAmount); + //var totalPurchaseFreight = orderCostDetailList.Union(insertOrderCostDetails).Sum(ocd => ocd.PurchaseFreight); + //orderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice.Value, + // totalPurchaseProductAmount ?? 0M, + // totalPurchaseFreight ?? 0M, + // 0M, + // 0M); + orderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice.Value, orderSkuCostList.Union(insertOrderSkuCostList).ToList()); + if (!isRepurchase) { @@ -539,10 +557,6 @@ namespace BBWYB.Server.Business fsql.Transaction(() => { - //if (updatePurchaseOrderIdList.Count() > 0) - // fsql.Update(updatePurchaseOrderIdList).Set(opi => opi.IsEnabled, false).ExecuteAffrows(); - //if (updateOrderCostDetailIdList.Count() > 0) - // fsql.Update(updateOrderCostDetailIdList).Set(ocd => ocd.IsEnabled, false).ExecuteAffrows(); if (updatePurchaseTimeLimitTaskOrderSkuList.Count() > 0) { fsql.Update().Set(t => t.CompletionTime, DateTime.Now) @@ -553,11 +567,14 @@ namespace BBWYB.Server.Business .Where(t => t.TaskType == Enums.TimeLimitTaskType.采购任务) .ExecuteAffrows(); } - - fsql.Insert(insertOrderCostDetails).ExecuteAffrows(); - fsql.Insert(insertOrderPurchaseInfos).ExecuteAffrows(); - fsql.Insert(insertOrderPurchaseSkuInfos).ExecuteAffrows(); - fsql.Insert(insertOrderPurchaseRelationInfoList).ExecuteAffrows(); + if (insertOrderCostDetails.Count() > 0) + fsql.Insert(insertOrderCostDetails).ExecuteAffrows(); + if (insertOrderPurchaseInfos.Count() > 0) + fsql.Insert(insertOrderPurchaseInfos).ExecuteAffrows(); + if (insertOrderPurchaseSkuInfos.Count() > 0) + fsql.Insert(insertOrderPurchaseSkuInfos).ExecuteAffrows(); + if (insertOrderPurchaseRelationInfoList.Count() > 0) + fsql.Insert(insertOrderPurchaseRelationInfoList).ExecuteAffrows(); updateOrderCost?.ExecuteAffrows(); insertOrderCost?.ExecuteAffrows(); if (updatePurchaseTimeSchemeIdList.Count() > 0) @@ -566,7 +583,13 @@ namespace BBWYB.Server.Business .SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark) .Set(o => o.IsPurchased, true) .ExecuteAffrows(); - //.Set(o => o.PackConfigState, Enums.PackConfigState.待配置) + if (insertOrderSkuCostList.Count() > 0) + fsql.Insert(insertOrderSkuCostList).ExecuteAffrows(); + if (updateOrderSkuCostList.Count() > 0) + { + foreach (var update in updateOrderSkuCostList) + update.ExecuteAffrows(); + } }); } @@ -689,7 +712,7 @@ namespace BBWYB.Server.Business var dbOrderSkuList = fsql.Select().Where(osku => osku.OrderId == request.OrderId).ToList(); var dbOrderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId && ocd.IsEnabled == true).ToList(); var dbOrderCost = fsql.Select(request.OrderId).ToOne(); - + var dbOrderSkuCostList = fsql.Select().Where(osc => osc.OrderId == request.OrderId).ToList(); List insertOrderPurchaseInfoList = new List(); @@ -702,6 +725,9 @@ namespace BBWYB.Server.Business IInsert insertOrderCost = null; IUpdate updateOrderCost = null; + List insertOrderSkuCostList = new List(); + IList> updateOrderSkuCostList = new List>(); + List updatePurchaseTimeLimitTaskOrderSkuList = new List(); List notifyQikuPackSchemeParamList = new List(); @@ -839,10 +865,7 @@ namespace BBWYB.Server.Business SkuId = assOrderCostDetail.SkuId, PurchaseOrderId = purchaseOrder.PurchaseOrderId }; - orderCostDetail.CalculationOrderCostDetailCostAndProfit(dbOrderSku.Price.Value * dbOrderSku.ItemTotal.Value, - dbOrderSku.BuyerPayFreight ?? 0M, - dbOrderSku.InPackAmount ?? 0M, - assOrderCostDetail.SkuAmount, + orderCostDetail.CalculationOrderCostDetailCostAndProfit(assOrderCostDetail.SkuAmount, purchaseFreight, 0M, 0M); @@ -932,8 +955,8 @@ namespace BBWYB.Server.Business var purchaseFreight = purchaseOrder.PurchaseFreight * (1.0M * assOrderCostDetail.PurchaseQuantity / totalQuantity); - - if (orderCostDetail == null) + var isOcdEmpty = orderCostDetail == null; + if (isOcdEmpty) { orderCostDetail = new OrderCostDetail() { @@ -949,15 +972,12 @@ namespace BBWYB.Server.Business }; } orderCostDetail.DeductionQuantity = assOrderCostDetail.PurchaseQuantity; - orderCostDetail.CalculationOrderCostDetailCostAndProfit(dbOrderSku.Price.Value * dbOrderSku.ItemTotal.Value, - dbOrderSku.BuyerPayFreight ?? 0M, - dbOrderSku.InPackAmount ?? 0M, - assOrderCostDetail.SkuAmount, - purchaseFreight, - orderCostDetail.OutPackAmount ?? 0M, - orderCostDetail.DeliveryExpressFreight ?? 0M); - - if (orderCostDetail == null) + orderCostDetail.CalculationOrderCostDetailCostAndProfit(assOrderCostDetail.SkuAmount, + purchaseFreight, + orderCostDetail.OutPackAmount ?? 0M, + orderCostDetail.DeliveryExpressFreight ?? 0M); + + if (isOcdEmpty) insertOrderCostDetailList.Add(orderCostDetail); else updateOrderCostDetailList.Add(fsql.Update().SetSource(orderCostDetail)); @@ -965,6 +985,33 @@ namespace BBWYB.Server.Business } } + #region 订单Sku成本 + var allOrderCostDetail = dbOrderCostDetailList.Union(insertOrderCostDetailList).ToList(); + foreach (var orderSku in dbOrderSkuList) + { + var orderSkuCost = dbOrderSkuCostList.FirstOrDefault(osc => osc.SkuId == orderSku.SkuId); + if (orderSkuCost == null) + { + orderSkuCost = new OrderSkuCost() + { + Id = idGenerator.NewLong(), + CreateTime = DateTime.Now, + OrderId = request.OrderId, + SkuId = orderSku.SkuId + }; + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, allOrderCostDetail); + insertOrderSkuCostList.Add(orderSkuCost); + } + else + { + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, allOrderCostDetail); + var update = fsql.Update().SetSource(orderSkuCost); + updateOrderSkuCostList.Add(update); + } + } + #endregion + + #region 订单成本 var dbOrderCostIsEmpty = dbOrderCost == null; if (dbOrderCostIsEmpty) { @@ -975,20 +1022,21 @@ namespace BBWYB.Server.Business CreateTime = DateTime.Now }; } - - var totalPurchaseProductAmount = request.AssociationPurchaseOrderList.Sum(x => x.PurchaseAmount); - var totalPurchaseFreight = request.AssociationPurchaseOrderList.Sum(x => x.PurchaseFreight); - var totalOutPackAmount = dbOrderCostDetailList.Sum(ocd => ocd.OutPackAmount); - dbOrderCost.CalculationOrderCostCostAndProfit(dbOrder.OrderTotalPrice.Value, - totalPurchaseProductAmount, - totalPurchaseFreight, - totalOutPackAmount ?? 0M, - 0M); + dbOrderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice.Value, dbOrderSkuCostList.Union(insertOrderSkuCostList).ToList()); + //var totalPurchaseProductAmount = request.AssociationPurchaseOrderList.Sum(x => x.PurchaseAmount); + //var totalPurchaseFreight = request.AssociationPurchaseOrderList.Sum(x => x.PurchaseFreight); + //var totalOutPackAmount = dbOrderCostDetailList.Sum(ocd => ocd.OutPackAmount); + //dbOrderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice.Value, + // totalPurchaseProductAmount, + // totalPurchaseFreight, + // totalOutPackAmount ?? 0M, + // 0M); if (dbOrderCostIsEmpty) insertOrderCost = fsql.Insert(dbOrderCost); else updateOrderCost = fsql.Update().SetSource(dbOrderCost); + #endregion #region 订单状态 dbOrder.CalculationOrderState(fsql, out _, dbOrderSkuList, dbPurchaseOrderList.Union(insertOrderPurchaseInfoList).ToList()); @@ -1043,6 +1091,14 @@ namespace BBWYB.Server.Business fsql.Update(dbOrder.Id).Set(o => o.OrderState, dbOrder.OrderState) .Set(o => o.IsPurchased, true) .ExecuteAffrows(); + + if (insertOrderSkuCostList.Count() > 0) + fsql.Insert(insertOrderSkuCostList).ExecuteAffrows(); + if (updateOrderSkuCostList.Count() > 0) + { + foreach (var update in updateOrderSkuCostList) + update.ExecuteAffrows(); + } }); } @@ -1198,15 +1254,26 @@ namespace BBWYB.Server.Business if (historyPurchaseOrder == null) throw new BusinessException("未查询到采购单"); + IList> updateOrderSkuCostList = new List>(); + var dbOrderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId && - ocd.PurchaseOrderId != request.PurchaseOrderId).ToList(); + ocd.PurchaseOrderId != request.PurchaseOrderId && + ocd.IsEnabled == true).ToList(); + var dbOrderSkuCostList = fsql.Select().Where(osc => osc.OrderId == request.OrderId).ToList(); var dbOrderCost = fsql.Select(request.OrderId).ToOne(); var dbOrder = fsql.Select(request.OrderId).ToOne(); + var dbOrderSku = fsql.Select().Where(osku => osku.OrderId == request.OrderId).ToList(); + + foreach (var orderSkuCost in dbOrderSkuCostList) + { + var orderSku = dbOrderSku.FirstOrDefault(osku => osku.SkuId == orderSkuCost.SkuId); + if (orderSku == null) + continue; + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, dbOrderCostDetailList); + updateOrderSkuCostList.Add(fsql.Update().SetSource(orderSkuCost)); + } - var purchaseProductAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.SkuAmount) ?? 0M; - var purchaseFreight = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.PurchaseFreight) ?? 0M; - var outPackAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.OutPackAmount) ?? 0M; - dbOrderCost.CalculationOrderCostCostAndProfit(dbOrder.OrderTotalPrice.Value, purchaseProductAmount, purchaseFreight, outPackAmount, 0M); + dbOrderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice ?? 0M, dbOrderSkuCostList); #region 找出失效的快递单 List deleteWaybillNoList = new List(); @@ -1231,12 +1298,19 @@ namespace BBWYB.Server.Business fsql.Transaction(() => { - fsql.Update(historyPurchaseOrder.Id) - .Set(opi => opi.IsEnabled, false) - .Set(opi => opi.OrderState, Enums.PurchaseOrderState.已取消) - .Set(opi => opi.HistorySettingTime, DateTime.Now) - .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId) - .ExecuteAffrows(); + if (request.IsDelete == true) + { + fsql.Delete(historyPurchaseOrder.Id).ExecuteAffrows(); + } + else + { + fsql.Update(historyPurchaseOrder.Id) + .Set(opi => opi.IsEnabled, false) + .Set(opi => opi.OrderState, Enums.PurchaseOrderState.已取消) + .Set(opi => opi.HistorySettingTime, DateTime.Now) + .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId) + .ExecuteAffrows(); + } fsql.Update() .Set(ocd => ocd.IsEnabled, false) @@ -1255,83 +1329,88 @@ namespace BBWYB.Server.Business fsql.Update().SetSource(dbOrderCost).ExecuteAffrows(); fsql.Update(dbOrder.Id).Set(o => o.OrderState, dbOrder.OrderState).ExecuteAffrows(); + if (updateOrderSkuCostList.Count() > 0) + { + foreach (var update in updateOrderSkuCostList) + update.ExecuteAffrows(); + } }); } - public void DeletePurchaseOrder(DeletePurchaseOrderRequest request) - { - nLogManager.Default().Info($"DeletePurchaseOrder {JsonConvert.SerializeObject(request)}"); + //public void DeletePurchaseOrder(DeletePurchaseOrderRequest request) + //{ + // nLogManager.Default().Info($"DeletePurchaseOrder {JsonConvert.SerializeObject(request)}"); - //var po = fsql.Select().Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId).ToOne(); - //if (po == null) - // throw new BusinessException("采购单不不存在"); - //var orderId = po.OrderId; + // //var po = fsql.Select().Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId).ToOne(); + // //if (po == null) + // // throw new BusinessException("采购单不不存在"); + // //var orderId = po.OrderId; - var orderPurchaseInfoList = fsql.Select().Where(opi => opi.OrderId == request.OrderId).ToList(); - var deletePurchaseOrder = orderPurchaseInfoList.FirstOrDefault(opi => opi.PurchaseOrderId == request.PurchaseOrderId); - if (deletePurchaseOrder == null) - throw new BusinessException("采购单不不存在"); + // var orderPurchaseInfoList = fsql.Select().Where(opi => opi.OrderId == request.OrderId).ToList(); + // var deletePurchaseOrder = orderPurchaseInfoList.FirstOrDefault(opi => opi.PurchaseOrderId == request.PurchaseOrderId); + // if (deletePurchaseOrder == null) + // throw new BusinessException("采购单不不存在"); - var dbOrderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId && - ocd.PurchaseOrderId != request.PurchaseOrderId).ToList(); - var dbOrderCost = fsql.Select(request.OrderId).ToOne(); - var dbOrder = fsql.Select(request.OrderId).ToOne(); + // var dbOrderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId && + // ocd.PurchaseOrderId != request.PurchaseOrderId).ToList(); + // var dbOrderCost = fsql.Select(request.OrderId).ToOne(); + // var dbOrder = fsql.Select(request.OrderId).ToOne(); - var purchaseProductAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.SkuAmount) ?? 0M; - var purchaseFreight = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.PurchaseFreight) ?? 0M; - var outPackAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.OutPackAmount) ?? 0M; - dbOrderCost.CalculationOrderCostCostAndProfit(dbOrder.OrderTotalPrice.Value, purchaseProductAmount, purchaseFreight, outPackAmount, 0M); + // var purchaseProductAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.SkuAmount) ?? 0M; + // var purchaseFreight = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.PurchaseFreight) ?? 0M; + // var outPackAmount = dbOrderCostDetailList.Count() == 0 ? 0M : dbOrderCostDetailList.Sum(ocd => ocd.OutPackAmount) ?? 0M; + // dbOrderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice.Value, purchaseProductAmount, purchaseFreight, outPackAmount, 0M); - #region 找出失效的快递单 - List deleteWaybillNoList = new List(); + // #region 找出失效的快递单 + // List deleteWaybillNoList = new List(); - //查询该采购单所使用的快递单号 - var useWaybillNos = fsql.Select().Where(eori => eori.PurchaseOrderId == request.PurchaseOrderId).ToList(eori => eori.WayBillNo); + // //查询该采购单所使用的快递单号 + // var useWaybillNos = fsql.Select().Where(eori => eori.PurchaseOrderId == request.PurchaseOrderId).ToList(eori => eori.WayBillNo); - //查询使用上述快递单号的快递单关系 - var expressOrderRelationList = fsql.Select().Where(eori => useWaybillNos.Contains(eori.WayBillNo)).ToList(); + // //查询使用上述快递单号的快递单关系 + // var expressOrderRelationList = fsql.Select().Where(eori => useWaybillNos.Contains(eori.WayBillNo)).ToList(); - //以快递单号进行分组 - var expressOrderRelationGroups = expressOrderRelationList.GroupBy(eori => eori.WayBillNo); - foreach (var group in expressOrderRelationGroups) - { - if (group.Count() == group.Count(eori => eori.PurchaseOrderId == request.PurchaseOrderId)) - deleteWaybillNoList.Add(group.Key); - } - #endregion + // //以快递单号进行分组 + // var expressOrderRelationGroups = expressOrderRelationList.GroupBy(eori => eori.WayBillNo); + // foreach (var group in expressOrderRelationGroups) + // { + // if (group.Count() == group.Count(eori => eori.PurchaseOrderId == request.PurchaseOrderId)) + // deleteWaybillNoList.Add(group.Key); + // } + // #endregion - orderPurchaseInfoList.Remove(deletePurchaseOrder); - while (orderPurchaseInfoList.Any(opi => opi.IsEnabled == false)) - { - var historyPo = orderPurchaseInfoList.FirstOrDefault(opi => opi.IsEnabled == false); - orderPurchaseInfoList.Remove(historyPo); - } - dbOrder.CalculationOrderState(fsql, out _, orderPurchaseInfoList: orderPurchaseInfoList); + // orderPurchaseInfoList.Remove(deletePurchaseOrder); + // while (orderPurchaseInfoList.Any(opi => opi.IsEnabled == false)) + // { + // var historyPo = orderPurchaseInfoList.FirstOrDefault(opi => opi.IsEnabled == false); + // orderPurchaseInfoList.Remove(historyPo); + // } + // dbOrder.CalculationOrderState(fsql, out _, orderPurchaseInfoList: orderPurchaseInfoList); - fsql.Transaction(() => - { - fsql.Delete(deletePurchaseOrder.Id).ExecuteAffrows(); + // fsql.Transaction(() => + // { + // fsql.Delete(deletePurchaseOrder.Id).ExecuteAffrows(); - fsql.Update() - .Set(ocd => ocd.IsEnabled, false) - .Where(ocd => ocd.PurchaseOrderId == request.PurchaseOrderId) - .ExecuteAffrows(); + // fsql.Update() + // .Set(ocd => ocd.IsEnabled, false) + // .Where(ocd => ocd.PurchaseOrderId == request.PurchaseOrderId) + // .ExecuteAffrows(); - fsql.Delete().Where(opsi => opsi.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); - fsql.Delete().Where(opri => opri.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); + // fsql.Delete().Where(opsi => opsi.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); + // fsql.Delete().Where(opri => opri.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); - fsql.Delete().Where(eori => eori.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); - if (deleteWaybillNoList.Count() > 0) - fsql.Delete(deleteWaybillNoList).ExecuteAffrows(); + // fsql.Delete().Where(eori => eori.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); + // if (deleteWaybillNoList.Count() > 0) + // fsql.Delete(deleteWaybillNoList).ExecuteAffrows(); - fsql.Delete().Where(i => i.OrderId == request.OrderId && i.PurchaseOrderId == request.PurchaseOrderId) - .ExecuteAffrows(); + // fsql.Delete().Where(i => i.OrderId == request.OrderId && i.PurchaseOrderId == request.PurchaseOrderId) + // .ExecuteAffrows(); - fsql.Update().SetSource(dbOrderCost).ExecuteAffrows(); - fsql.Update(dbOrder.Id).Set(o => o.OrderState, dbOrder.OrderState).ExecuteAffrows(); - }); - } + // fsql.Update().SetSource(dbOrderCost).ExecuteAffrows(); + // fsql.Update(dbOrder.Id).Set(o => o.OrderState, dbOrder.OrderState).ExecuteAffrows(); + // }); + //} /// /// 修改采购快递单 @@ -2758,13 +2837,14 @@ namespace BBWYB.Server.Business if (dbOrderCostDetails.Count() == 0) throw new Exception($"采购单{purchaseOrderId}-未查询到订单{orderPurchaseInfo.OrderId}的明细成本"); - var dbPurchaseOrderIdList = dbOrderPurchaseInfoList.Select(x => x.PurchaseOrderId).ToList(); var dbOrderPurchaseRelationInfos = fsql.Select().Where(x => dbPurchaseOrderIdList.Contains(x.PurchaseOrderId)).ToList(); if (dbOrderPurchaseRelationInfos.Count() == 0) throw new Exception($"采购单{purchaseOrderId}-未查询到采购单关联明细"); - var dbOrderSkus = fsql.Select().Where(osku => osku.OrderId == orderPurchaseInfo.OrderId).ToList(); + var dbOrderSkus = fsql.Select().Where(osku => osku.OrderId == dbOrder.Id).ToList(); + var dbOrderSkuCostList = fsql.Select().Where(osc => osc.OrderId == dbOrder.Id).ToList(); + List> updateOrderCostDetailList = new List>(); IUpdate updateOrderCost = null; @@ -2772,6 +2852,9 @@ namespace BBWYB.Server.Business IList> updateOrderSkuList = new List>(); IUpdate updateOrder = null; + List insertOrderSkuCostList = new List(); + IList> updateOrderSkuCostList = new List>(); + IList op_EditPriceSkuRequests = new List(); var ppclient = ppPlatformClientFactory.GetClient(AdapterEnums.PlatformType.阿里巴巴); @@ -2841,10 +2924,7 @@ namespace BBWYB.Server.Business #endregion var dbOrderSkuDetail = dbOrderCostDetails.FirstOrDefault(ocd => ocd.SkuId == belongSkuId && ocd.PurchaseOrderId == opi.PurchaseOrderId); - dbOrderSkuDetail.CalculationOrderCostDetailCostAndProfit(orderSku.Price.Value * orderSku.ItemTotal.Value, - orderSku.BuyerPayFreight ?? 0M, - orderSku.InPackAmount ?? 0M, - currentOrderSkuProductAmount, + dbOrderSkuDetail.CalculationOrderCostDetailCostAndProfit(currentOrderSkuProductAmount, currentPurchaseFreight ?? 0M, dbOrderSkuDetail.OutPackAmount ?? 0M, dbOrderSkuDetail.DeliveryExpressFreight ?? 0M); @@ -2861,12 +2941,40 @@ namespace BBWYB.Server.Business .Set(o => o.FreightPrice, dbOrder.FreightPrice); } - dbOrderCost.CalculationOrderCostCostAndProfit(dbOrder.OrderTotalPrice ?? 0M, - totalPurchaseProductAmount, - totalPurchaseFreight, - dbOrderCostDetails.Sum(ocd => ocd.OutPackAmount ?? 0M), - dbOrderCostDetails.Sum(ocd => ocd.DeliveryExpressFreight ?? 0M)); + #region 订单Sku成本 + foreach (var orderSku in dbOrderSkus) + { + var orderSkuCost = dbOrderSkuCostList.FirstOrDefault(osc => osc.SkuId == orderSku.SkuId); + if (orderSkuCost == null) + { + orderSkuCost = new OrderSkuCost() + { + Id = idGenerator.NewLong(), + CreateTime = DateTime.Now, + OrderId = dbOrder.Id, + SkuId = orderSku.SkuId + }; + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, dbOrderCostDetails); + insertOrderSkuCostList.Add(orderSkuCost); + } + else + { + orderSkuCost.CalculationOrderSkuCostAndProfit(orderSku, dbOrderCostDetails); + var update = fsql.Update().SetSource(orderSkuCost); + updateOrderSkuCostList.Add(update); + } + } + #endregion + + #region 订单成本 + dbOrderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice.Value, dbOrderSkuCostList.Union(insertOrderSkuCostList).ToList()); + //dbOrderCost.CalculationOrderCostAndProfit(dbOrder.OrderTotalPrice ?? 0M, + // totalPurchaseProductAmount, + // totalPurchaseFreight, + // dbOrderCostDetails.Sum(ocd => ocd.OutPackAmount ?? 0M), + // dbOrderCostDetails.Sum(ocd => ocd.DeliveryExpressFreight ?? 0M)); updateOrderCost = fsql.Update().SetSource(dbOrderCost); + #endregion fsql.Transaction(() => { @@ -2876,6 +2984,13 @@ namespace BBWYB.Server.Business foreach (var update in updateOrderSkuList) update.ExecuteAffrows(); updateOrder?.ExecuteAffrows(); + if (insertOrderSkuCostList.Count() > 0) + fsql.Insert(insertOrderSkuCostList).ExecuteAffrows(); + if (updateOrderSkuCostList.Count() > 0) + { + foreach (var update in updateOrderSkuCostList) + update.ExecuteAffrows(); + } }); if (isEditOrderPrice) diff --git a/BBWYB.Server.Model/Db/Order/OrderCost.cs b/BBWYB.Server.Model/Db/Order/Cost/OrderCost.cs similarity index 100% rename from BBWYB.Server.Model/Db/Order/OrderCost.cs rename to BBWYB.Server.Model/Db/Order/Cost/OrderCost.cs diff --git a/BBWYB.Server.Model/Db/Order/OrderCostDetail.cs b/BBWYB.Server.Model/Db/Order/Cost/OrderCostDetail.cs similarity index 100% rename from BBWYB.Server.Model/Db/Order/OrderCostDetail.cs rename to BBWYB.Server.Model/Db/Order/Cost/OrderCostDetail.cs diff --git a/BBWYB.Server.Model/Db/Order/Cost/OrderSkuCost.cs b/BBWYB.Server.Model/Db/Order/Cost/OrderSkuCost.cs new file mode 100644 index 0000000..6053218 --- /dev/null +++ b/BBWYB.Server.Model/Db/Order/Cost/OrderSkuCost.cs @@ -0,0 +1,62 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + [Table(Name = "orderskucost", DisableSyncStructure = true)] + public partial class OrderSkuCost { + + [Column(IsPrimary = true)] + public long Id { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 发货运费 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? DeliveryExpressFreight { get; set; } + + /// + /// 订单Id + /// + [Column(StringLength = 50)] + public string OrderId { get; set; } + + /// + /// 支出打包费 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? OutPackAmount { get; set; } + + /// + /// 订单利润 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? Profit { get; set; } + + /// + /// 采购运费 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? PurchaseFreight { get; set; } + + /// + /// 采购货款 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? SkuAmount { get; set; } + + [Column(StringLength = 50)] + public string SkuId { get; set; } + + /// + /// Sku总成本 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? TotalCost { get; set; } + + } + +} diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SetHistoryPurchaseOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SetHistoryPurchaseOrderRequest.cs index 72a02b9..0a9476f 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SetHistoryPurchaseOrderRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SetHistoryPurchaseOrderRequest.cs @@ -11,5 +11,7 @@ /// 采购单Id /// public string PurchaseOrderId { get; set; } + + public bool? IsDelete { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderCostResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderCostResponse.cs index a11a0ff..4a01b40 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderCostResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderCostResponse.cs @@ -4,6 +4,6 @@ namespace BBWYB.Server.Model.Dto { public class OrderCostResponse : OrderCost { - + public IList OrderSkuCostList { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuCostResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuCostResponse.cs new file mode 100644 index 0000000..f3c62b1 --- /dev/null +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuCostResponse.cs @@ -0,0 +1,9 @@ +using BBWYB.Server.Model.Db; + +namespace BBWYB.Server.Model.Dto +{ + public class OrderSkuCostResponse : OrderSkuCost + { + public IList OrderCostDetailList { get; set; } + } +} diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs index 98b51c9..a890d67 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs @@ -20,11 +20,6 @@ namespace BBWYB.Server.Model.Dto /// public IList PurchaseExpressOrderList { get; set; } - ///// - ///// 限时任务列表 - ///// - //public IList TimeLimitTaskList { get; set; } - /// /// 采购限时任务 ///