shanji 3 years ago
parent
commit
4e550fbef1
  1. 17
      BBWY.Server.Business/Order/OrderBusiness.cs
  2. 12
      BBWY.Test/JDBaoBiaoAPITest.cs
  3. 4
      BBWY.Test/Program.cs

17
BBWY.Server.Business/Order/OrderBusiness.cs

@ -615,7 +615,7 @@ namespace BBWY.Server.Business
if (osku != null) if (osku != null)
{ {
orderCostDetail.SkuGrossProfit = osku.Price.Value * orderCostDetail.DeductionQuantity - orderCostDetail.SkuGrossProfit = osku.Price.Value * orderCostDetail.DeductionQuantity -
(orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) * (orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight) -
osku.Price.Value * orderCostDetail.DeductionQuantity * manualCalculationCostRequest.PlatformCommissionRatio; osku.Price.Value * orderCostDetail.DeductionQuantity * manualCalculationCostRequest.PlatformCommissionRatio;
} }
} }
@ -784,12 +784,14 @@ namespace BBWY.Server.Business
List<PurchaseOrder> insertPurchaseOrderList = new List<PurchaseOrder>(); List<PurchaseOrder> insertPurchaseOrderList = new List<PurchaseOrder>();
List<OrderCostDetail> insertOrderCostDetailList = new List<OrderCostDetail>(); List<OrderCostDetail> insertOrderCostDetailList = new List<OrderCostDetail>();
var dbOrderSkuList = fsql.Select<OrderSku>().Where(osku => osku.OrderId == dbOrder.Id).ToList();
var oldPourchaseIdList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id) var oldPourchaseIdList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id)
.ToList(ocd => ocd.PurchaseOrderPKId); .ToList(ocd => ocd.PurchaseOrderPKId);
deletePurchaseOrder = fsql.Delete<PurchaseOrder>().Where(po => oldPourchaseIdList.Contains(po.Id)); deletePurchaseOrder = fsql.Delete<PurchaseOrder>().Where(po => oldPourchaseIdList.Contains(po.Id));
deleteOrderCostDetail = fsql.Delete<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id); deleteOrderCostDetail = fsql.Delete<OrderCostDetail>().Where(ocd => ocd.OrderId == dbOrder.Id);
foreach (var odsRequest in relationPurchaseOrderRequestV2.OrderDropShippingList) foreach (var odsRequest in relationPurchaseOrderRequestV2.OrderDropShippingList)
{ {
#region 代发信息表 #region 代发信息表
@ -843,7 +845,7 @@ namespace BBWY.Server.Business
#endregion #endregion
#region 明细 #region 明细
insertOrderCostDetailList.Add(new OrderCostDetail() var orderCostDetail = new OrderCostDetail()
{ {
Id = idGenerator.NewLong(), Id = idGenerator.NewLong(),
ConsumableAmount = 0, ConsumableAmount = 0,
@ -863,7 +865,16 @@ namespace BBWY.Server.Business
//TotalCost = relationOrderSku.SingleSkuAmount * relationOrderSku.Quantity + odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(), //TotalCost = relationOrderSku.SingleSkuAmount * relationOrderSku.Quantity + odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(),
//UnitCost = purchaseOrder.UnitCost, //UnitCost = purchaseOrder.UnitCost,
PurchaseOrderPKId = purchaseOrder.Id 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 #endregion
} }

12
BBWY.Test/JDBaoBiaoAPITest.cs

@ -629,5 +629,17 @@ namespace BBWY.Test
Console.WriteLine(); Console.WriteLine();
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));
}
} }
} }

4
BBWY.Test/Program.cs

@ -26,11 +26,11 @@ namespace BBWY.Test
{ {
var appkey = "120EA9EC65AB017567D78CC1139EEEA5"; var appkey = "120EA9EC65AB017567D78CC1139EEEA5";
var appSecret = "8a42bc2301e8439b896e99f5475e0a9b"; var appSecret = "8a42bc2301e8439b896e99f5475e0a9b";
var token = "b46065ef5b894f2297686e28d39cb37a2mdy"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm"; var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm";
IJdClient client = GetJdClient(appkey, appSecret); IJdClient client = GetJdClient(appkey, appSecret);
var test1 = new JDBaoBiaoAPITest(); 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);
//test1.Test_订单维度_京速推(client, token); //test1.Test_订单维度_京速推(client, token);
Console.WriteLine(); Console.WriteLine();

Loading…
Cancel
Save