Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -293,12 +293,13 @@ namespace BBWY.Server.Business
                 SDOrderAmount = 0,
                 PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount
             };
-            orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio;
-            orderCost.Profit = dbOrder.OrderSellerPrice +
-                               dbOrder.FreightPrice -
-                               orderCost.PurchaseAmount -
-                               orderCost.DeliveryExpressFreight -
-                               orderCost.PlatformCommissionAmount;
+            //orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio;
+            //orderCost.Profit = dbOrder.OrderSellerPrice +
+            //                   dbOrder.FreightPrice -
+            //                   orderCost.PurchaseAmount -
+            //                   orderCost.DeliveryExpressFreight -
+            //                   orderCost.PlatformCommissionAmount;
+            orderCost.CalculationOrderProfitAndCost(dbOrder, null);
             if (!isRepurchase)
             {
                 insertOrderCost = fsql.Insert(orderCost);
@@ -712,6 +713,15 @@ namespace BBWY.Server.Business
 
                     orderCostDetail.SkuAmount = currentOrderSkuProductAmount;
                     orderCostDetail.PurchaseFreight = currentOrderSkuFreightAmount;
+                    orderCostDetail.CalculationSkuGrossProfit(orderSku.ShouldPay ?? 0M,
+                                                              orderSku.PingTaiChengDanYouHuiQuan ?? 0M,
+                                                              orderSku.SuperRedEnvelope ?? 0M,
+                                                              orderSku.XianPinLeiDongQuan ?? 0M,
+                                                              orderSku.VenderFee ?? 0M,
+                                                              orderSku.JingDou ?? 0M,
+                                                              orderSku.DongQuan ?? 0M,
+                                                              orderSku.Balance ?? 0M,
+                                                              orderCost.PlatformCommissionRatio);
                     //orderCostDetail.UnitCost = purchaseOrder.UnitCost;
                     //orderCostDetail.TotalCost = currentOrderSkuProductAmount + currentOrderSkuFreightAmount;
 
@@ -721,11 +731,12 @@ namespace BBWY.Server.Business
 
                 }
                 orderCost.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount;
-                orderCost.Profit = dbOrder.OrderSellerPrice +
-                                   dbOrder.FreightPrice -
-                                   orderCost.PurchaseAmount -
-                                   orderCost.DeliveryExpressFreight -
-                                   orderCost.PlatformCommissionAmount;
+                //orderCost.Profit = dbOrder.OrderSellerPrice +
+                //                   dbOrder.FreightPrice -
+                //                   orderCost.PurchaseAmount -
+                //                   orderCost.DeliveryExpressFreight -
+                //                   orderCost.PlatformCommissionAmount;
+                orderCost.CalculationOrderProfitAndCost(dbOrder, null);
 
                 orderDropshipping.PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount;
                 orderDropshipping.SkuAmount = purchaseOrderSimpleInfo.ProductAmount;