投资回报分析，海外仓要加入中转仓的计算

AutoTurnOver.DB/report_invest_return_dao.cs

@@ -171,14 +171,28 @@ namespace AutoTurnOver.DB
             var day30Btime = DateTime.Now.AddDays(-31).ToDayHome();
             var day7Btime = DateTime.Now.AddDays(-8).ToDayHome();
             var dayEtime = DateTime.Now.AddDays(-1).ToDayEnd();
-            // 查询这个sku涉及的所有仓库
-            var stocks = _connection.Query<dc_base_stock>(" select * from dc_base_stock where bailun_sku=@sku and warehouse_code in ( select warehouse_code from dc_base_warehouse where hq_type in @warehouse_types ) ", new { sku = sku.sku, warehouse_types= (sku.warehouse_type??"").Split(',').ToList() });
+            // 查询这个sku涉及的所有仓库 
+            var warehouse_types = (sku.warehouse_type ?? "").Split(',').ToList();
+            var stocks = _connection.Query<dc_base_stock>(" select * from dc_base_stock where bailun_sku=@sku and warehouse_code in ( select warehouse_code from dc_base_warehouse where hq_type in @warehouse_types ) ", new { sku = sku.sku, warehouse_types= warehouse_types }).ToList();
+            // 国内仓先去除中转仓
+            stocks = stocks.Where(s => s.warehouse_code != "GZBLZZG").ToList();
+            // 如果是海外仓或者fba，就再加上中转仓
+            var haiwaiTypes = new List<string> { "海外仓", "第三方仓库","FBA仓" };
+            if (warehouse_types.Any(s=> haiwaiTypes.Any(s1=>s==s1)))
+            {
+                var transferWarehouse = _connection.QueryFirstOrDefault<dc_base_stock>(" select * from dc_base_stock where bailun_sku=@sku and warehouse_code =@warehouse_code ", new { sku = sku.sku, warehouse_code = "GZBLZZG" });
+                if (transferWarehouse != null)
+                {
+                    stocks.Add(transferWarehouse);
+                }
+            }
+
             // 查询sku 基础表
             var baseSku = _connection.QueryFirstOrDefault<dc_base_sku>(" select * from dc_base_sku where     bailun_sku=@bailun_sku ", new
             {
                 bailun_sku = sku.sku
             });
-            var chinaWarehouseCodes = new List<string> { "GZBLWH", "BLGZ03" }; 
+            var chinaWarehouseCodes = new List<string> { "GZBLWH", "BLGZ03", "GZBLZZG" }; 
             foreach (var stockItem in stocks)
             {
                 
@@ -249,12 +263,17 @@ namespace AutoTurnOver.DB
                     seller_order_exchange_rate = null,
                 };
 
+                //如果是中转仓
+                if(stockItem.warehouse_code== "GZBLZZG")
+                {
+                    ana.quantity_transfer = ana.library_stock;
+                }
+
                 if (orders30.Any(s => s.seller_order_exchange_rate > 0))
                 {
                    // ana.seller_order_exchange_rate = orders.Where(s => s.paid_time >= day30Btime).Where(s => s.seller_order_exchange_rate > 0).Average(s => s.seller_order_exchange_rate);
                 }
                 ana.quantity_purchase_amount = ana.quantity_purchase * ana.price;
-                ana.quantity_purchase_amount = ana.quantity_purchase * ana.price;
                 ana.quantity_transfer_amount = ana.quantity_transfer * ana.price;
                 ana.stock_amount = ana.stock * ana.price;
                 ana.library_stock_amount = ana.library_stock * ana.price;