1

Bailun.DC.MonthSaleProfit/Services.cs

@@ -516,7 +516,7 @@ namespace Bailun.DC.MonthSaleProfit
 
                 sql = $@"select sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_ordered) as amount_sales,sum(cost_product*bailun_sku_quantity_ordered) as cost_product,sum(cost_platform_fee*seller_order_exchange_rate*bailun_sku_quantity_ordered) as cost_platform_fee,sum(cost_first*bailun_sku_quantity_ordered) as cost_first,sum(cost_logistics*bailun_sku_quantity_ordered) as cost_logistics,sum(cost_fba_fee*seller_order_exchange_rate*bailun_sku_quantity_ordered) cost_fba_fee,if(t6.financecategoryname is null,'',t6.financecategoryname) as financecategoryname from dc_base_oms_sku tb left join dc_base_sku t5 on tb.bailun_sku=t5.bailun_sku
                     left join dc_base_sku_finance_category t6 on t6.bailuncategoryid=t5.bailun_category_id
-                    where tb.company_id=1 and tb.bailun_order_status!='Canceled' and ((tb.platform_type!='FBA' and tb.bailun_order_status!='CantHandle') or tb.platform_type='FBA') and tb.has_scalp=0 and tb.has_innersale=0 and tb.bailun_interception_status in ('None','Failed') and tb.platform_type='FBA' and tb.create_time>='{day.ToString("yyyy-MM-dd")}' and tb.create_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'
+                    where tb.company_id=1 and tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.has_innersale=0 and tb.bailun_interception_status in ('None','Failed') and tb.platform_type='FBA' and tb.create_time>='{day.ToString("yyyy-MM-dd")}' and tb.create_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'
                     group by t6.financecategoryname
                     ";
                 objFBA = cn.Query<Models.mOrder>(sql,null,null,true,6*60).ToList();
@@ -524,27 +524,27 @@ namespace Bailun.DC.MonthSaleProfit
                 decimal? obj = 0;
 
                 //销售额=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他
-                m.amount_sales_dianzi = objOrder.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.amount_sales)??0+ objFBA.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.amount_sales) ?? 0;
-                m.amount_sales_fuzhuang = objOrder.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.amount_sales) ?? 0+ objFBA.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.amount_sales) ?? 0;
-                m.amount_sales_jiaju = objOrder.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.amount_sales) ?? 0+ objFBA.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.amount_sales) ?? 0;
-                m.amount_sales_jingyou = objOrder.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.amount_sales) ?? 0+ objFBA.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.amount_sales) ?? 0;
-                m.amount_sales_meirongmj = objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0+ objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0;
+                m.amount_sales_dianzi = (objOrder.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.amount_sales)??0)+ (objFBA.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.amount_sales) ?? 0);
+                m.amount_sales_fuzhuang = (objOrder.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.amount_sales) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.amount_sales) ?? 0);
+                m.amount_sales_jiaju = (objOrder.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.amount_sales) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.amount_sales) ?? 0);
+                m.amount_sales_jingyou = (objOrder.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.amount_sales) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.amount_sales) ?? 0);
+                m.amount_sales_meirongmj = (objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0);
 
-                m.amount_sales = m.amount_sales_dianzi + m.amount_sales_fuzhuang + m.amount_sales_jiaju + m.amount_sales_jingyou + m.amount_sales_meirongmj;
-                m.amount_sales_other = objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0 + objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0;
-                m.amount_sales += m.amount_sales_other;
+                m.amount_sales_other = (objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0) + (objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0);
 
+                m.amount_sales = m.amount_sales_dianzi + m.amount_sales_fuzhuang + m.amount_sales_jiaju + m.amount_sales_jingyou + m.amount_sales_meirongmj+ m.amount_sales_other;
+                
                 //产品成本=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他类型成本
-                m.cost_dianzi = objOrder.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.cost_product) ?? 0;
-                m.cost_fuzhuang = objOrder.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.cost_product) ?? 0;
-                m.cost_jiaju = objOrder.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.cost_product) ?? 0;
-                m.cost_jingyou = objOrder.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.cost_product) ?? 0;
-                m.cost_meirongmj = objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0;
+                m.cost_dianzi = (objOrder.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.cost_product) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "电子产品类")?.Sum(a => a.cost_product) ?? 0);
+                m.cost_fuzhuang = (objOrder.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.cost_product) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "服装类")?.Sum(a => a.cost_product) ?? 0);
+                m.cost_jiaju = (objOrder.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.cost_product) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "家居用品类")?.Sum(a => a.cost_product) ?? 0);
+                m.cost_jingyou = (objOrder.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.cost_product) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "精油类")?.Sum(a => a.cost_product) ?? 0);
+                m.cost_meirongmj = (objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0)+ (objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0);
 
-                m.cost = m.cost_dianzi + m.cost_fuzhuang + m.cost_jiaju + m.cost_jingyou + m.cost_meirongmj;
-                m.cost_other = objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.cost_product) ?? 0 + objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.cost_product) ?? 0;
-                m.cost += m.cost_other;
+                m.cost_other = (objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.cost_product) ?? 0) + (objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.cost_product) ?? 0);
 
+                m.cost = m.cost_dianzi + m.cost_fuzhuang + m.cost_jiaju + m.cost_jingyou + m.cost_meirongmj+ m.cost_other;
+                
                 
                 //平台费=平台费+paypal费+处理费+广告费+上架费
                 m.fee_platform = objOrder.Sum(a => a.cost_platform_fee??0+a.cost_paypal_fee??0+a.cost_handle_platform??0) + objFBA.Sum(a => a.cost_platform_fee??0);