如果广告gmv大于订单gmv，则自然订单利润率为0

Bailun.DC.DailyItemNoProfitRate/Program.cs

@@ -19,9 +19,9 @@ namespace Bailun.DC.DailyItemNoProfitRate
             await builder.RunConsoleAsync();
 
             //var _service = new Services();
-            //var day = DateTime.Parse(DateTime.Now.AddDays(-2).ToShortDateString());
+            //var day = DateTime.Parse(DateTime.Now.AddDays(-1).ToShortDateString());
             //_service.Init(day.AddDays(-20), day);
-            //_service.SaveProfitRate(day.AddDays(-20), day);
+            ////_service.SaveProfitRate(day.AddDays(-20), day);
             //_service.OneDayItemNoProfitRate(day.AddDays(-1), day);
         }
     }

Bailun.DC.DailyItemNoProfitRate/Services.cs

@@ -87,7 +87,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
                 listBaseOrder = cn.Query<dc_mid_itemno_profit_order>($@"select distinct t3.id as order_sku_id,t1.bailun_order_id,t1.origin_order_id,t1.item_id,t1.platform_sku,t1.platform_sku_quantity_ordered,t3.bailun_sku,t3.paid_time,(t3.amount_sales*t1.platform_sku_quantity_ordered) as amount_sales,(t3.cost_product*t1.platform_sku_quantity_ordered) cost_product,(t3.cost_platform_fee*t1.platform_sku_quantity_ordered) cost_platform_fee,(t3.cost_paypal_fee*t1.platform_sku_quantity_ordered) cost_paypal_fee,(t3.cost_fba_fee*t1.platform_sku_quantity_ordered) cost_fba_fee,(t3.cost_first*t1.platform_sku_quantity_ordered) cost_first,(t3.cost_logistics*t1.platform_sku_quantity_ordered) cost_logistics,(t3.cost_handle_platform*t1.platform_sku_quantity_ordered) cost_handle_platform,(t3.cost_handle_bailun*t1.platform_sku_quantity_ordered) cost_handle_bailun,t3.warehouse_code,t3.shipping_status,t3.seller_order_exchange_rate,t1.platform_type,t1.website,t1.bailun_account_id from dc_base_oms_platform_sku t1
                     join dc_base_sku_mapping_online t2 on t1.item_id=t2.item_id and t2.item_sku=t1.platform_sku and t1.website=t2.site
                     join dc_base_oms_sku_30 t3 on t1.bailun_order_id=t3.bailun_order_id and t2.sku_code=t3.bailun_sku and t2.account_id=t3.bailun_account_id
-                    where t1.platform_type in ('Ebay','FBA','Amazon') and t3.has_delete=0 and t3.company_id=1 and t1.paid_time>='{start.AddHours(-15).ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddHours(16).AddDays(1).ToString("yyyy-MM-dd")}'", null, null, true, 6 * 60).ToList();
+                    where t1.platform_type in ('Ebay','FBA','Amazon') and t3.has_delete=0 and t3.company_id=1 and t1.paid_time>='{start.AddHours(-16).ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddHours(16).AddDays(1).ToString("yyyy-MM-dd")}'", null, null, true, 6 * 60).ToList();
             }
 
             if(listBaseOrder.Count>0)
@@ -236,7 +236,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
                 //过去20天自然订单销售成本 = 过去20天OMS订单总销售成本（不计广告费）*（1 - 广告订单GMV占比）
                 //自然订单GMV - 过去20天自然订单销售成 = 自然订单利润
                 //自然订单利润 / 过去20天自然订单GMV = 自然订单利润率
-                m.rate_order = (m.amount_sales - m.amount_sales_ad_gmv) > 0 ? ((m.amount_sales - m.amount_sales_ad_gmv) - (m.cost_sales * (1 - objadrate))) / (m.amount_sales - m.amount_sales_ad_gmv) : 0;
+                m.rate_order = (m.amount_sales<=m.amount_sales_ad_gmv?0:((m.amount_sales - m.amount_sales_ad_gmv) > 0 ? ((m.amount_sales - m.amount_sales_ad_gmv) - (m.cost_sales * (1 - objadrate))) / (m.amount_sales - m.amount_sales_ad_gmv) : 0));  //如果广告GMV大于订单GMV，则自然订单利润率为0
 
                 //过去20天广告GMV/过去20天OMS订单销量额=广告订单GMV占比
                 //过去20天OMS订单总销售成本（不计广告费）*广告订单GMV占比=过去20天广告订单总销售成本
@@ -363,7 +363,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
                 //过去20天自然订单销售成本 = 过去20天OMS订单总销售成本（不计广告费）*（1 - 广告订单GMV占比）
                 //自然订单GMV - 过去20天自然订单销售成 = 自然订单利润
                 //自然订单利润 / 过去20天自然订单GMV = 自然订单利润率
-                m.rate_order = (m.amount_sales - m.amount_sales_ad_gmv) > 0 ? m.amount_sales - m.amount_sales_ad_gmv - (m.cost_sales * (1 - objadrate)) / (m.amount_sales - m.amount_sales_ad_gmv) : 0;
+                m.rate_order = (m.amount_sales_ad_gmv>m.amount_sales?0:((m.amount_sales - m.amount_sales_ad_gmv) > 0 ? m.amount_sales - m.amount_sales_ad_gmv - (m.cost_sales * (1 - objadrate)) / (m.amount_sales - m.amount_sales_ad_gmv) : 0));
 
                 //过去20天广告GMV/过去20天OMS订单销量额=广告订单GMV占比
                 //过去20天OMS订单总销售成本（不计广告费）*广告订单GMV占比=过去20天广告订单总销售成本

Bailun.DC.Web/Controllers/HomeController.cs

@@ -51,6 +51,8 @@ namespace Bailun.DC.Web.Controllers
 
             //new Services.UserAuthorityServices().Add(list);
 
+            var str = "{\"poDetails\":[{\"orderUom\":\"Each\",\"lineNumber\":\"1\",\"partnerSkuId\":\"CN-FLO-87158\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"2\",\"partnerSkuId\":\"CN-FLO-87202\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"3\",\"partnerSkuId\":\"CN-FLO-87189\",\"quantity\":150,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"4\",\"partnerSkuId\":\"CN-FLO-87219\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"5\",\"partnerSkuId\":\"CN-FLO-87226\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"6\",\"partnerSkuId\":\"CN-FLO-87172\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"7\",\"partnerSkuId\":\"CN-FLO-87165\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"},{\"orderUom\":\"Each\",\"lineNumber\":\"8\",\"partnerSkuId\":\"CN-FLO-87196\",\"quantity\":100,\"expectedDeliveryDate\":\"2021-01-01T07:45:46.504Z\"}],\"recordCreateDate\":\"2020-12-25T07:45:46.504Z\",\"poNumber\":\"COUP194937\"}";
+
             return View();
         }