销量接口排除刷单的销量统计

Bailun.DC.AllotOrderDetail/Services.cs

@@ -88,8 +88,8 @@ namespace Bailun.DC.AllotOrderDetail
                             page = page,
                             rows = rows
                         },
-                        StartTime = "2020-07-29 17:15",//starttime.ToString("yyyy-MM-dd HH:mm:ss"),
-                        EndTime = "2020-07-29 17:16"//endtime.ToString("yyyy-MM-dd HH:mm:ss"),
+                        StartTime = starttime.ToString("yyyy-MM-dd HH:mm:ss"),
+                        EndTime = endtime.ToString("yyyy-MM-dd HH:mm:ss"),
                     },
                 };
 
@@ -201,12 +201,7 @@ namespace Bailun.DC.AllotOrderDetail
                         cn.Insert<dc_base_transfer_info_skus>(s);
                     }
                 }
-
-                
-
             }
-
-            
         }
 
     }

Bailun.DC.LogicWareHouse/Models/dc_semi_stock_sales_shipping.cs

@@ -45,7 +45,7 @@ namespace Bailun.DC.LogicWareHouse
 
         public decimal sales_30 { get; set; }
 
-        public decimal stock_amount_1 { get; set; }
+        public decimal sales_1_amount { get; set; }
 
         public decimal out_stock_30 { get; set; }
 
@@ -53,5 +53,31 @@ namespace Bailun.DC.LogicWareHouse
 
         public int available_days { get; set; }
 
+        /// <summary>
+        /// 7天销售额
+        /// </summary>
+        public decimal sales_7_amount { get; set; }
+
+        /// <summary>
+        /// 14天销售额
+        /// </summary>
+        public decimal sales_14_amount { get; set; }
+
+        /// <summary>
+        /// 30天销售额
+        /// </summary>
+        public decimal sales_30_amount { get; set; }
+
+        /// <summary>
+        /// 30天调出金额
+        /// </summary>
+        public decimal out_stock_30_amount { get; set; }
+
+        /// <summary>
+        /// 30天调入金额
+        /// </summary>
+        public decimal put_stock_30_amount { get; set; }
+
+
     }
 }

Bailun.DC.LogicWareHouse/Models/mResponse.cs

@@ -65,12 +65,23 @@ namespace Bailun.DC.LogicWareHouse
 
         public decimal sales_30 { get; set; }
 
-        public decimal stock_amount_1 { get; set; }
+        public decimal sales_1_amount { get; set; }
 
         public decimal out_stock_30 { get; set; }
 
         public decimal put_stock_30 { get; set; }
 
         public int available_days { get; set; }
+
+
+        public decimal sales_7_amount { get; set; }
+
+        public decimal sales_14_amount { get; set; }
+
+        public decimal sales_30_amount { get; set; }
+
+        public decimal out_stock_30_amount { get; set; }
+
+        public decimal put_stock_30_amount { get; set; }
     }
 }

Bailun.DC.LogicWareHouse/Program.cs

@@ -7,30 +7,30 @@ namespace Bailun.DC.LogicWareHouse
 {
     class Program
     {
-        static async Task Main(string[] args)
-        {
-            Console.WriteLine("进入 逻辑仓库");
-            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
-            {
-                services.AddHostedService<Services>();
-            });
+        //static async Task Main(string[] args)
+        //{
+        //    Console.WriteLine("进入 逻辑仓库");
+        //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
+        //    {
+        //        services.AddHostedService<Services>();
+        //    });
 
-            await builder.RunConsoleAsync();
-        }
+        //    await builder.RunConsoleAsync();
+        //}
 
-        //static void Main(string[] args)
-        //{
-        //    var _service = new Services();
+        static void Main(string[] args)
+        {
+            var _service = new Services();
 
-        //    //半成品销量
-        //    //_service.UpdateSemiSale();
+            //半成品销量
+            _service.UpdateSemiSale();
 
-        //    //更新半成品销量和现金流
-        //    //_service.UpdateLogicWareHouseSemiSale();
+            //更新半成品销量和现金流
+            //_service.UpdateLogicWareHouseSemiSale();
 
 
-        //    //保存每日数据快照
-        //    //_service.SaleWHDailySnaps();
-        //}
+            //保存每日数据快照
+            //_service.SaleWHDailySnaps();
+        }
     }
 }

Bailun.DC.LogicWareHouse/Services.cs

@@ -270,9 +270,17 @@ namespace Bailun.DC.LogicWareHouse
                                             stock_amount = item.stock_amount,
 
 
-                                            stock_amount_1 = item.stock_amount_1,
+                                            sales_1_amount = item.sales_1_amount,
                                             warehouse_id = item.warehouse_id,
-                                            warehouse_name = item.warehouse_name
+                                            warehouse_name = item.warehouse_name,
+
+
+                                            sales_7_amount = item.sales_7_amount,
+                                            sales_14_amount = item.sales_14_amount,
+                                            sales_30_amount = item.sales_30_amount,
+                                            out_stock_30_amount = item.out_stock_30_amount,
+                                            put_stock_30_amount = item.put_stock_30_amount,
+
                                         };
 
                                         cn.Insert<dc_semi_stock_sales_shipping>(m);
@@ -313,8 +321,24 @@ namespace Bailun.DC.LogicWareHouse
                 Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 启动更新半成品销量和现金流任务");
                 var sql = @"update dc_skuwarehouse_stock_sales t1
                 join dc_semi_stock_sales_shipping t2 on t2.warehouse_name=t1.warehouse_name and t1.bailun_sku=t2.sku
-                set t1.quantity_purchase=t2.on_the_way_count,t1.purchase_amount=t2.on_the_way_amount,t1.oneday_total_sales=t2.sales_1,t1.amount_onedaysale=t2.stock_amount_1,t1.sevenday_total_sales=t2.sales_7,t1.fourteenday_total_sales=t2.sales_14,t1.thirtyday_total_sales=t2.sales_30,t1.nostockcount=t2.out_of_stock,t1.noshippingcount=t2.need_quantity,t1.quantity_tuneout_30days=t2.out_stock_30,t1.quantity_tunein_30days=t2.put_stock_30;
-                ";
+                set
+                t1.quantity_purchase=t2.on_the_way_count,
+                t1.purchase_amount=t2.on_the_way_amount,
+                t1.oneday_total_sales=t2.sales_1,
+                t1.amount_onedaysale=t2.sales_1_amount,
+                t1.sevenday_total_sales=t2.sales_7,
+                t1.fourteenday_total_sales=t2.sales_14,
+                t1.thirtyday_total_sales=t2.sales_30,
+                t1.nostockcount=t2.out_of_stock,
+                t1.noshippingcount=t2.need_quantity,
+                t1.quantity_tuneout_30days=t2.out_stock_30,
+                t1.quantity_tunein_30days=t2.put_stock_30,
+
+                t1.sevenday_total_sales_amount=t2.sales_7_amount,
+                t1.fourteenday_total_sales_amount=t2.sales_14_amount,
+                t1.thirtyday_total_sales_amount=t2.sales_30_amount,
+                t1.amount_tuneout_30days=t2.out_stock_30_amount,
+                t1.amount_tunein_30days=t2.put_stock_30_amount";
 
                 using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
                 {
@@ -408,7 +432,6 @@ namespace Bailun.DC.LogicWareHouse
                 Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "重跑UpdateCash30Days，异常信息：" + ex.Message);
                 UpdateCash30Days();
             }
-            
         }
 
         /// <summary>
@@ -470,8 +493,8 @@ namespace Bailun.DC.LogicWareHouse
             {
                 Console.WriteLine("开始执行保存逻辑仓库的每日快照信息 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
 
-                var sql = @"insert into dc_daily_logic_wh_statistic (day,hq_type,warehouse_code,warehouse_name,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,oneday_total_sales,amount_onedaysale,sevenday_total_sales,fourteenday_total_sales,thirtyday_total_sales,quantity_tuneout_onway,quantity_tuneout_30days,quantity_tunein_30days,nostockcount,noshippingcount,cash_in_30days,cash_out_30days,cash_net,pin_rate_stock)
-select DATE_SUB(curdate(),INTERVAL 1 DAY) as day,t1.* from (select t1.hq_type,t1.warehouse_code,t1.warehouse_name,sum(t1.usable_stock) usable_stock,sum(t1.amount_stock) amount_stock,sum(t1.quantity_purchase) quantity_purchase,sum(t1.purchase_amount) purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.amount_transit) amount_transit,sum(t1.oneday_total_sales) oneday_total_sales,sum(t1.amount_onedaysale) amount_onedaysale,sum(t1.sevenday_total_sales) sevenday_total_sales,sum(t1.fourteenday_total_sales) fourteenday_total_sales,sum(t1.thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(t1.quantity_tuneout_30days) quantity_tuneout_30days,sum(t1.quantity_tunein_30days) quantity_tunein_30days,sum(nostockcount) as nostockcount,sum(noshippingcount) as noshippingcount,sum(cash_in_30days) as cash_in_30days,sum(cash_out_30days) as cash_out_30days,sum(cash_net) as cash_net,(sum(thirtyday_total_sales)/sum(usable_stock)) as pin_rate_stock from dc_skuwarehouse_stock_sales t1 group by warehouse_code) t1";
+                var sql = @"insert into dc_daily_logic_wh_statistic (day,hq_type,warehouse_code,warehouse_name,usable_stock,amount_stock,quantity_purchase,purchase_amount,quantity_transfer,amount_transit,oneday_total_sales,amount_onedaysale,sevenday_total_sales,fourteenday_total_sales,thirtyday_total_sales,quantity_tuneout_onway,quantity_tuneout_30days,quantity_tunein_30days,nostockcount,noshippingcount,cash_in_30days,cash_out_30days,cash_net,pin_rate_stock,sevenday_total_sales_amount,fourteenday_total_sales_amount,thirtyday_total_sales_amount,amount_tuneout_30days,amount_tunein_30days)
+select DATE_SUB(curdate(),INTERVAL 1 DAY) as day,t1.* from (select t1.hq_type,t1.warehouse_code,t1.warehouse_name,sum(t1.usable_stock) usable_stock,sum(t1.amount_stock) amount_stock,sum(t1.quantity_purchase) quantity_purchase,sum(t1.purchase_amount) purchase_amount,sum(t1.quantity_transfer) quantity_transfer,sum(t1.amount_transit) amount_transit,sum(t1.oneday_total_sales) oneday_total_sales,sum(t1.amount_onedaysale) amount_onedaysale,sum(t1.sevenday_total_sales) sevenday_total_sales,sum(t1.fourteenday_total_sales) fourteenday_total_sales,sum(t1.thirtyday_total_sales) thirtyday_total_sales,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(t1.quantity_tuneout_30days) quantity_tuneout_30days,sum(t1.quantity_tunein_30days) quantity_tunein_30days,sum(nostockcount) as nostockcount,sum(noshippingcount) as noshippingcount,sum(cash_in_30days) as cash_in_30days,sum(cash_out_30days) as cash_out_30days,sum(cash_net) as cash_net,(sum(thirtyday_total_sales)/sum(usable_stock)) as pin_rate_stock,sum(sevenday_total_sales_amount) as sevenday_total_sales_amount,sum(fourteenday_total_sales_amount) as fourteenday_total_sales_amount,sum(thirtyday_total_sales_amount) as thirtyday_total_sales_amount,sum(amount_tuneout_30days) as amount_tuneout_30days,sum(amount_tunein_30days) as amount_tunein_30days from dc_skuwarehouse_stock_sales t1 group by warehouse_code) t1";
 
                 using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString + "Allow User Variables=True;"))
                 {

Bailun.DC.Models/Warehouse/dc_skuwarehouse_stock_sales.cs

@@ -34,10 +34,16 @@ namespace Bailun.DC.Models.Warehouse
 
         public int? sevenday_total_sales { get; set; }
 
+        public decimal sevenday_total_sales_amount { get; set; }
+
         public int? fourteenday_total_sales { get; set; }
 
+        public decimal? fourteenday_total_sales_amount { get; set; }
+
         public int? thirtyday_total_sales { get; set; }
 
+        public decimal? thirtyday_total_sales_amount { get; set; }
+
         /// <summary>
         /// 调出在途数
         /// </summary>
@@ -49,10 +55,21 @@ namespace Bailun.DC.Models.Warehouse
         public int? quantity_tuneout_30days { get; set; }
 
         /// <summary>
+        /// 30天内调出金额
+        /// </summary>
+        public decimal? amount_tuneout_30days { get; set; }
+
+        /// <summary>
         /// 30天内调入数量
         /// </summary>
         public int? quantity_tunein_30days { get; set; }
 
+        /// <summary>
+        /// 30天内调入金额
+        /// </summary>
+        public decimal? amount_tunein_30days { get; set; }
+
+
         public DateTime? createtime { get; set; }
 
         /// <summary>

Bailun.DC.Services/OrdersServices.cs

@@ -3887,7 +3887,7 @@ namespace Bailun.DC.Services
         public List<Models.Ebay.mEbaySkuSales> ListEbaySkuSalesCount(int page, int pagesize, DateTime start, DateTime end, string[] skus, string platform,int timetype=1)
         {
             var sql = $@"select t1.platform_type,t1.website,t1.bailun_sku,sum(t1.bailun_sku_quantity_ordered) as bailun_sku_quantity_ordered,sum(t1.bailun_sku_quantity_ordered*t1.amount_sales*t1.seller_order_exchange_rate) as amount_sales from dc_base_oms_sku t1 
-                        where bailun_order_status!='Canceled'";
+                        where bailun_order_status!='Canceled' and has_scalp=0 and has_delete=0 and has_innersale=0 and has_innersale=0 ";
 
             if (timetype == 1)
             {
@@ -3946,7 +3946,7 @@ namespace Bailun.DC.Services
         public List<Models.Ebay.mEbaySkuSales> ListEbaySkuSalesCountByPlatformCreateTime(int page, int pagesize, DateTime start, DateTime end, string[] skus, string platform)
         {
             var sql = $@"select t1.platform_type,t1.website,t1.bailun_sku,sum(t1.bailun_sku_quantity_ordered) as bailun_sku_quantity_ordered,sum(t1.bailun_sku_quantity_ordered*t1.amount_sales*t1.seller_order_exchange_rate) as amount_sales from dc_base_oms_sku t1 
-                        where t1.purchase_create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.purchase_create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and bailun_order_status!='Canceled' and t1.has_delete = 0 and t1.has_scalp = 0 ";
+                        where t1.purchase_create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.purchase_create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_delete=0 and t1.has_innersale=0  ";
 
             if (!string.IsNullOrEmpty(platform))
             {