reset 利润数据

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -2003,8 +2003,12 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
             profit_data.freight_stock_amount_air = profit_data.quantity_final_air_difference_amount <= 0 ? 0 : ((profit_data.freight_price_air_difference_amount) / (profit_data.quantity_final_air_difference_amount));
             profit_data.freight_stock_amount_ocean_30 = profit_data.turnover_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_ocean_30_difference) / profit_data.turnover_amount);
             profit_data.freight_stock_amount_air_30 = profit_data.turnover_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_air_30_difference) / profit_data.turnover_amount);
+            
             var formula_json = profit_data.ToJson();
             dc_report_profit_analysis data = formula_json.ToObj<dc_report_profit_analysis>();
+            data.forecast_daily_weighted_sales = profit_data.turnover_days <= 0 ? 0 : Math.Round(profit_data.turnover_sales / profit_data.turnover_days);
+            data.forecast_daily_weighted_sales_ocean = profit_data.turnover_days_ocean <= 0 ? 0 : Math.Round(profit_data.turnover_sales_ocean / profit_data.turnover_days_ocean);
+            data.forecast_daily_weighted_sales_air = profit_data.turnover_days_air <= 0 ? 0 : Math.Round(profit_data.turnover_sales_air / profit_data.turnover_days_air);
             data.bailun_sku = bailun_sku;
             data.formula_json = formula_json;
             data.warehouse_code = warehouse_code;
@@ -2068,7 +2072,7 @@ from dc_base_oms_sku where bailun_sku=@bailun_sku and warehouse_code=@warehouse_
         /// </summary>
         public static void SynchroCalculationProfitAnalysis()
         {
-            var task_name = $"SynchroCalculationProfitAnalysis_v14";
+            var task_name = $"SynchroCalculationProfitAnalysis_v15";
             var conn = MyMySqlConnection._connection; ;
             // 查询最后一次成功抓取的记录
             var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select  * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });

AutoTurnOver.Models/dc_report_profit_analysis.cs

@@ -300,21 +300,19 @@ namespace AutoTurnOver.Models
         /// 计算过程
         /// </summary>
         public string formula_json { get; set;}
+
+        /// <summary>
+        /// 预测日均
+        /// </summary>
+        public decimal forecast_daily_weighted_sales { get; set;}
+
+        public decimal forecast_daily_weighted_sales_ocean { get; set;}
+        public decimal forecast_daily_weighted_sales_air { get; set;}
     }
 
     public  class dc_report_profit_analysis_dto: dc_report_profit_analysis {
         public string product_code { get; set; }
         public decimal? weight { get; set; }
-        /// <summary>
-        /// 预测日均销量
-        /// </summary>
-        public decimal forecast_daily_weighted_sales
-        { get {
-                if (turnover_days <= 0) return 0;
-                else
-                {
-                    return Math.Round(turnover_sales / turnover_days, 2);
-                }
-            } }
+
     }
 }