服装采购，由原来的强行下到 广州03 改到下到自己的仓库

AutoTurnOver.DB/purchase_advise.cs

@@ -366,7 +366,7 @@ sum(t7.quantity_out_stock_aliexpress) as 'quantity_out_stock_aliexpress'
 	select 
 	t1.bailun_sku,
 	t1.warehouse_code as 'source_warehouse_code',
-    'BLGZ03' as 'warehouse_code',
+    t1.warehouse_code as 'warehouse_code',
 	-1 as 'quantity_init_advise', -- 原始采购建议数量 new
 	( (t7.quantity_out_stock) - ( ((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end )) + (t1.quantity_transfer) + (t7.quantity_purchase) )   ) as 'quantity_final_advise', -- 计算moq之后的数量 new
 	t6.product_inner_code as 'product_inner_code', -- 内部商品编码 new

AutoTurnOver.Models/Report/dc_base_finance_amazon_ad_product.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models.Report
+{
+    public partial class dc_base_finance_amazon_ad_product
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 广告系列名称
+        /// </summary>
+        public string campaign_name { get; set; }
+
+        /// <summary>
+        /// 广告系列唯一ID
+        /// </summary>
+        public string campaign_id { get; set; }
+
+        /// <summary>
+        /// 广告组名称
+        /// </summary>
+        public string ad_group_name { get; set; }
+
+        /// <summary>
+        /// 广告组唯一ID
+        /// </summary>
+        public string ad_group_id { get; set; }
+
+        /// <summary>
+        /// 广告总展示次数
+        /// </summary>
+        public int impressions { get; set; }
+
+        /// <summary>
+        /// 广告总点击次数
+        /// </summary>
+        public int clicks { get; set; }
+
+        /// <summary>
+        /// 所有点击总费用
+        /// </summary>
+        public decimal cost { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string currency { get; set; }
+
+        /// <summary>
+        /// ASIN
+        /// </summary>
+        public string asin { get; set; }
+
+        /// <summary>
+        /// 平台SKU
+        /// </summary>
+        public string sku { get; set; }
+
+        /// <summary>
+        /// 1天内规因转化事件数
+        /// </summary>
+        public int attributed_conversions_oneday { get; set; }
+
+        /// <summary>
+        /// 7天内归因转化事件数
+        /// </summary>
+        public int attributed_conversions_sevenday { get; set; }
+
+        /// <summary>
+        /// 14天内归因转化事件数
+        /// </summary>
+        public int attributed_conversions_fourteenday { get; set; }
+
+        /// <summary>
+        /// 30天内归因转化事件数
+        /// </summary>
+        public int attributed_conversions_thirtyday { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_conversions_oneday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_conversions_sevenday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_conversions_fourteenday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_conversions_thirtyday_same_sku { get; set; }
+
+        /// <summary>
+        /// 1天内订购的归属单位数量
+        /// </summary>
+        public int attributed_units_ordered_oneday { get; set; }
+
+        /// <summary>
+        /// 7天内订购归属单位数量
+        /// </summary>
+        public int attributed_units_ordered_sevenday { get; set; }
+
+        /// <summary>
+        /// 14天内订购归属单位数量
+        /// </summary>
+        public string attributed_units_ordered_fourteenday { get; set; }
+
+        /// <summary>
+        /// 30天内订购归属单位数量
+        /// </summary>
+        public string attributed_units_ordered_thirtyday { get; set; }
+
+        /// <summary>
+        /// 1天内规因销售数量
+        /// </summary>
+        public int attributed_sales_oneday { get; set; }
+
+        /// <summary>
+        /// 7天内归因销售数量
+        /// </summary>
+        public int attributed_sales_sevenday { get; set; }
+
+        /// <summary>
+        /// 14天内归因销售数量
+        /// </summary>
+        public int attributed_sales_fourteenday { get; set; }
+
+        /// <summary>
+        /// 30天内归因销售数量
+        /// </summary>
+        public int attributed_sales_thirtyday { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_sales_oneday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_sales_sevenday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_sales_fourteenday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_sales_thirtyday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_units_ordered_oneday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_units_ordered_sevenday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_units_ordered_fourteenday_same_sku { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string attributed_units_ordered_thirtyday_same_sku { get; set; }
+
+        /// <summary>
+        /// 帐号ID
+        /// </summary>
+        public int account_id { get; set; }
+
+        /// <summary>
+        /// 公司ID
+        /// </summary>
+        public int company_id { get; set; }
+
+        /// <summary>
+        /// 本地创建时间
+        /// </summary>
+        public DateTime bj_create_time { get; set; }
+
+        /// <summary>
+        /// 本地更新时间
+        /// </summary>
+        public DateTime bj_modify_time { get; set; }
+
+        /// <summary>
+        /// 报告日期
+        /// </summary>
+        public DateTime report_date { get; set; }
+
+        /// <summary>
+        /// 无意义字段
+        /// </summary>
+        public string report_type { get; set; }
+
+        /// <summary>
+        /// 转人民币汇率
+        /// </summary>
+        public decimal exchange_rate { get; set; }
+
+        /// <summary>
+        /// 转美元汇率
+        /// </summary>
+        public decimal exchange_rate_usd { get; set; }
+    }
+}

AutoTurnOver.Models/Report/dc_base_finance_ebay.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models.Report
+{
+    public partial class dc_base_finance_ebay
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 数据中心创建时间
+        /// </summary>
+        public DateTime bj_create { get; set; }
+
+        /// <summary>
+        /// 数据中心更新时间
+        /// </summary>
+        public DateTime bj_modified { get; set; }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string account_entry_type { get; set; }
+
+        /// <summary>
+        /// 费用描述
+        /// </summary>
+        public string description { get; set; }
+
+        /// <summary>
+        /// 费用产生时间,以GMT格式指示条目过帐到帐户的日期和时间
+        /// </summary>
+        public DateTime gmt_date { get; set; }
+
+        /// <summary>
+        /// 费用产生时间,以GMT+8格式指示条目过帐到帐户的日期和时间
+        /// </summary>
+        public DateTime? bj_date { get; set; }
+
+        /// <summary>
+        /// ebay评估的总费用,包括净费用和增值税
+        /// </summary>
+        public decimal gross_amount { get; set; }
+
+        /// <summary>
+        /// item id
+        /// </summary>
+        public string item_id { get; set; }
+
+        /// <summary>
+        /// 费用条目的备注行
+        /// </summary>
+        public string memo { get; set; }
+
+        /// <summary>
+        /// ebay评估的净费用
+        /// </summary>
+        public decimal net_amount { get; set; }
+
+        /// <summary>
+        /// 帐户条目的唯一标识符
+        /// </summary>
+        public string ref_number { get; set; }
+
+        /// <summary>
+        /// 计算交易增值税（增值税）的适用税率
+        /// </summary>
+        public decimal vat_percent { get; set; }
+
+        /// <summary>
+        /// eBay用户帐户的货币交易或管理操作的描述或评论
+        /// </summary>
+        public string title { get; set; }
+
+        /// <summary>
+        /// eBay订单行项目的唯一标识符
+        /// </summary>
+        public string order_line_id { get; set; }
+
+        /// <summary>
+        /// 订单行项目的唯一标识符
+        /// </summary>
+        public string transaction_id { get; set; }
+
+        /// <summary>
+        /// 公司id
+        /// </summary>
+        public int company_id { get; set; }
+
+        /// <summary>
+        /// 是否有顶级折扣
+        /// </summary>
+        public int received_top_rated_discount { get; set; }
+
+        /// <summary>
+        /// 账号ID
+        /// </summary>
+        public int account_id { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string currency { get; set; }
+
+        /// <summary>
+        /// 转人民币汇率,根据bj_date取值
+        /// </summary>
+        public decimal exchange_rate { get; set; }
+
+        /// <summary>
+        /// 转美元汇率
+        /// </summary>
+        public decimal exchange_rate_usd { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? report_date { get; set; }
+    }
+}

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -147,7 +147,9 @@ namespace AutoTurnOver.Models
         FBA费 = 11,
         PayPal费 = 12,
         新增采购费用_首单 = 13,
-        新增头程费用_首单 = 14
+        新增头程费用_首单 = 14,
+        广告费 = 15,
+        上架费 = 16
     }
 
     public enum dc_report_cash_flow_log_pay_type_enum

ResetOutofstock/CaseFlowBackgrounService.cs

@@ -61,6 +61,33 @@ namespace ResetOutofstock
                     Console.WriteLine($"结束 刷新上周数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                 }
             }
+            if (now.Hour == 2 && now.Minute == 24)
+            {
+                if (now.DayOfWeek == DayOfWeek.Monday)
+                {
+                    Console.WriteLine($"开始 刷新ebay 广告费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                    report_cash_flow_dao.CalculationAdFeeEbay(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
+                    Console.WriteLine($"结束 刷新ebay 广告费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                }
+            }
+            if (now.Hour == 2 && now.Minute == 25)
+            {
+                if (now.DayOfWeek == DayOfWeek.Monday)
+                {
+                    Console.WriteLine($"开始 刷新amazon 广告费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                    report_cash_flow_dao.CalculationAdFeeAmazon(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
+                    Console.WriteLine($"结束 刷新amazon 广告费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                }
+            }
+            if (now.Hour == 2 && now.Minute == 26)
+            {
+                if (now.DayOfWeek == DayOfWeek.Monday)
+                {
+                    Console.WriteLine($"开始 刷新ebay 上架费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                    report_cash_flow_dao.CalculationPublishFeeEbay(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
+                    Console.WriteLine($"结束 刷新ebay 上架费，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                }
+            }
             if (now.Hour == 9 && now.Minute == 01)
             {
                 Console.WriteLine($"开始刷新 现金流 sku 报表 数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");

ResetOutofstock/ResetOutofstockBackgrounService.cs

@@ -14,10 +14,10 @@ namespace ResetOutofstock
 
         protected override Task ExecuteAsync(CancellationToken stoppingToken)
         {
-            Task.Factory.StartNew(() =>
-            {
-                report.ResetCashFlowData();
-            });
+            //Task.Factory.StartNew(() =>
+            //{
+            //    report.ResetCashFlowData();
+            //});
 
             //Task.Factory.StartNew(() =>
             //{