调整sku利润接口，增加可按百伦单号查询条件

Bailun.DC.Models/Orders/mShipSkuProfitInput.cs

@@ -12,5 +12,7 @@ namespace Bailun.DC.Models.Orders
 
         public DateTime end { get; set; }
 
+        public string bailun_order_id { get; set; }
+
     }
 }

Bailun.DC.Services/OrdersServices.cs

@@ -3662,12 +3662,20 @@ namespace Bailun.DC.Services
         /// <param name="end"></param>
         /// <param name="total"></param>
         /// <returns></returns>
-        public List<dc_base_oms_sku> ListOrderSkuProfit(int page, int pagesize, DateTime start, DateTime end)
+        public List<dc_base_oms_sku> ListOrderSkuProfit(int page, int pagesize, DateTime start, DateTime end,string orderno)
         {
+            var sqlparam = new DynamicParameters();
+
             var sql = $@"select t1.id,t2.warehouse_code,((((t1.amount_product-t1.cost_platform_fee)*t1.seller_order_exchange_rate)-t1.cost_logistics-t1.cost_handle_bailun)*t2.quantity_shipped) as productvalue, t1.platform_type,t1.seller_account,t1.bailun_account_id,t1.website,t1.bailun_order_id,t1.origin_order_id,t1.transaction_id,t1.paid_time,t1.gmt_modified,t1.bailun_sku,(t1.amount_sales*t1.seller_order_exchange_rate*t2.quantity_shipped) amount_sales,(t1.profit_total*t2.quantity_shipped) profit_total,t2.quantity_shipped as platform_sku_quantity_shipped,t1.company_id,t2.pick_order_id,t2.shipping_time,t2.has_delete
                         from dc_base_oms_sku t1
-                        join dc_base_oms_pick t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku = t2.bailun_sku and t2.shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t2.shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t2.shipping_status = 'TotalShipping' and t2.company_id = 1
-                        where t1.bailun_order_status != 'Canceled' and t1.has_scalp = 0 and t1.bailun_order_status != 'CantHandle' and t1.has_scalp = 0 and t1.has_innersale = 0 and t1.company_id = 1 and t1.has_delete = 0 and t1.bailun_interception_status in ('None','Failed') ";
+                        join dc_base_oms_pick t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku = t2.bailun_sku and t2.gmt_modified >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t2.gmt_modified < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t2.shipping_status = 'TotalShipping' and t2.company_id = 1
+                        where t1.bailun_order_status != 'Canceled' and t1.has_scalp = 0 and t1.bailun_order_status != 'CantHandle' and t1.has_scalp = 0 and t1.has_innersale = 0 and t1.company_id = 1 and t1.has_delete = 0 ";
+
+            if (!string.IsNullOrEmpty(orderno))
+            {
+                sql += " and t1.bailun_order_id=@orderno";
+                sqlparam.Add("orderno", orderno);
+            }
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
@@ -3676,7 +3684,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                var obj = cn.Query<dc_base_oms_sku>(sql + " limit " + (page - 1) * pagesize + "," + pagesize, 2 * 60);
+                var obj = cn.Query<dc_base_oms_sku>(sql + " limit " + (page - 1) * pagesize + "," + pagesize,sqlparam,null,true,2 * 60);
 
                 return obj.ToList();
             }

Bailun.DC.Web/Controllers/ApiController.cs

@@ -219,7 +219,7 @@ namespace Bailun.DC.Web.Controllers
         public JsonResult ListOrderSkuProfit([FromBody]Models.Orders.mShipSkuProfitInput m)
         {
             var pagesize = 1000;
-            var obj = new Services.OrdersServices().ListOrderSkuProfit(m.page, pagesize, m.start, m.end);
+            var obj = new Services.OrdersServices().ListOrderSkuProfit(m.page, pagesize, m.start, m.end,m.bailun_order_id);
 
             var list = obj.Select(a => new
             {