diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 142bff82..1b0da323 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -615,7 +615,7 @@ namespace BBWY.Server.Business if (osku != null) { orderCostDetail.SkuGrossProfit = osku.Price.Value * orderCostDetail.DeductionQuantity - - (orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) * + (orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) - osku.Price.Value * orderCostDetail.DeductionQuantity * manualCalculationCostRequest.PlatformCommissionRatio; } } @@ -784,12 +784,14 @@ namespace BBWY.Server.Business List insertPurchaseOrderList = new List(); List insertOrderCostDetailList = new List(); + var dbOrderSkuList = fsql.Select().Where(osku => osku.OrderId == dbOrder.Id).ToList(); var oldPourchaseIdList = fsql.Select().Where(ocd => ocd.OrderId == dbOrder.Id) .ToList(ocd => ocd.PurchaseOrderPKId); deletePurchaseOrder = fsql.Delete().Where(po => oldPourchaseIdList.Contains(po.Id)); deleteOrderCostDetail = fsql.Delete().Where(ocd => ocd.OrderId == dbOrder.Id); + foreach (var odsRequest in relationPurchaseOrderRequestV2.OrderDropShippingList) { #region 代发信息表 @@ -843,7 +845,7 @@ namespace BBWY.Server.Business #endregion #region 明细 - insertOrderCostDetailList.Add(new OrderCostDetail() + var orderCostDetail = new OrderCostDetail() { Id = idGenerator.NewLong(), ConsumableAmount = 0, @@ -863,7 +865,16 @@ namespace BBWY.Server.Business //TotalCost = relationOrderSku.SingleSkuAmount * relationOrderSku.Quantity + odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(), //UnitCost = purchaseOrder.UnitCost, PurchaseOrderPKId = purchaseOrder.Id - }); + }; + insertOrderCostDetailList.Add(orderCostDetail); + + var dbOrderSku = dbOrderSkuList.FirstOrDefault(dbosku => dbosku.SkuId == relationOrderSku.SkuId); + if (dbOrderSku != null) + { + orderCostDetail.SkuGrossProfit = dbOrderSku.Price.Value * orderCostDetail.DeductionQuantity - + (orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) - + dbOrderSku.Price.Value * orderCostDetail.DeductionQuantity * relationPurchaseOrderRequestV2.PlatformCommissionRatio; + } #endregion } diff --git a/BBWY.Test/JDBaoBiaoAPITest.cs b/BBWY.Test/JDBaoBiaoAPITest.cs index dc06900c..f83c225a 100644 --- a/BBWY.Test/JDBaoBiaoAPITest.cs +++ b/BBWY.Test/JDBaoBiaoAPITest.cs @@ -629,5 +629,17 @@ namespace BBWY.Test Console.WriteLine(); Console.WriteLine(); } + + public void Test_获取订单优惠明细(IJdClient client, string token) + { + var req = new PopOrderCoupondetailRequest(); + + req.orderId = 256709823974; + + var response = client.Execute(req, token, DateTime.Now.ToLocalTime()); + var res = client.Execute(req, token, DateTime.Now.ToLocalTime()); + Console.WriteLine(JsonConvert.SerializeObject(res)); + + } } } diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs index 5073116a..7f6e2aaf 100644 --- a/BBWY.Test/Program.cs +++ b/BBWY.Test/Program.cs @@ -26,11 +26,11 @@ namespace BBWY.Test { var appkey = "120EA9EC65AB017567D78CC1139EEEA5"; var appSecret = "8a42bc2301e8439b896e99f5475e0a9b"; - var token = "b46065ef5b894f2297686e28d39cb37a2mdy"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm"; + var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm"; IJdClient client = GetJdClient(appkey, appSecret); var test1 = new JDBaoBiaoAPITest(); - test1.Test_创意维度(client, token,"2022-10-29", "2022-10-29"); + test1.Test_获取订单优惠明细(client, token); //test1.Test_订单维度_快车(client, token); //test1.Test_订单维度_京速推(client, token); Console.WriteLine();