增加统计每日支出和收入，每日现金流明细的统计服务

Bailun.DC.HappenAmount/Program.cs

@@ -7,25 +7,25 @@ namespace Bailun.DC.HappenAmount
 {
     class Program
     {
-        static async Task Main(string[] args)
-        {
-            Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
-            {
-                services.AddHostedService<Services>();
-            });
-
-            await builder.RunConsoleAsync();
-        }
-
-        //static void Main(string[] args)
+        //static async Task Main(string[] args)
         //{
-        //    var start = DateTime.Parse("2019-08-01");
-        //    while (start < DateTime.Now)
+        //    Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+        //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
         //    {
-        //        new Services().Init(start, start.AddDays(1));
-        //        start = start.AddDays(1);
-        //    }
+        //        services.AddHostedService<Services>();
+        //    });
+
+        //    await builder.RunConsoleAsync();
         //}
+
+        static void Main(string[] args)
+        {
+            var start = DateTime.Parse("2019-09-01");
+            while (start < DateTime.Now)
+            {
+                new Services().Init(start, start.AddDays(1));
+                start = start.AddDays(1);
+            }
+        }
     }
 }

Bailun.DC.HappenAmount/Services.cs

@@ -134,7 +134,13 @@ namespace Bailun.DC.HappenAmount
                 m.hl_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen, null, null, 2 * 60) ?? 0;
 
                 //销售额
-                sqlsales = $"select sum(cost_first*bailun_sku_quantity_ordered) as cost_first from dc_base_oms_sku where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and bailun_order_status!='Canceled' and cost_first>0 and has_scalp=0 and has_delete=0 and has_innersale=0 and company_id=1";
+                sqlsales = $@"select sum(amount) amount from (
+                            select sum(t1.quantity_shipped* t2.cost_first) amount from dc_base_oms_pick t1
+                            join dc_base_oms_sku t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku = t2.bailun_sku and t2.has_delete = 0 and t2.has_scalp = 0 and t2.has_innersale = 0
+                            where t1.shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.shipping_status = 'TotalShipping'
+                            union all
+                            select sum(cost_first) amount from dc_base_oms_order t1 where t1.company_id = 1 and t1.platform_type = 'FBA' and t1.bailun_order_status != 'Canceled' and t1.create_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.has_scalp = 0 and t1.has_innersale = 0 and t1.bailun_interception_status in ('None', 'Failed')
+                            ) tb";
                 m.hl_amount_sales += cn.QueryFirstOrDefault<decimal?>(sqlsales, null, null, 2 * 60)??0;
 
                 #endregion

Bailun.DC.Models/dc_daily_companymoneystatus.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    /// <summary>
+    /// 跨境电商资金分析明细每日报表
+    /// </summary>
+    public class dc_daily_companymoneystatus
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 统计日期
+        /// </summary>
+        public DateTime record_time { get; set; }
+
+        /// <summary>
+        /// 采购下单
+        /// </summary>
+        public decimal amount_purchase { get; set; }
+
+        /// <summary>
+        /// 财务付款
+        /// </summary>
+        public decimal amount_payed { get; set; }
+
+        /// <summary>
+        /// 到货
+        /// </summary>
+        public decimal amount_arrivaled { get; set; }
+
+        /// <summary>
+        /// 库存
+        /// </summary>
+        public decimal amount_stock { get; set; }
+
+        /// <summary>
+        /// 售出
+        /// </summary>
+        public decimal amount_sale { get; set; }
+
+        /// <summary>
+        /// 应收款
+        /// </summary>
+        public decimal amount_receivable { get; set; }
+
+        /// <summary>
+        /// 放款在途
+        /// </summary>
+        public decimal amount_withdrawonway { get; set; }
+
+        /// <summary>
+        /// 银行到账
+        /// </summary>
+        public decimal amount_incoming { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime createtime { get; set; }
+
+    }
+}

Bailun.DC.SkuDailyPurchaseAndSales/Program.cs

@@ -7,28 +7,28 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
 {
     class Program
     {
-        static async Task Main(string[] args)
-        {
-            Console.WriteLine("进入保存每日采购数和售出数");
-            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
-            {
-                services.AddHostedService<Services>();
-            });
-
-            await builder.RunConsoleAsync();
-        }
-
-        //static void Main(string[] args)
+        //static async Task Main(string[] args)
         //{
-        //    var start = DateTime.Parse("2019-10-20");
-        //    while (start.AddDays(1) < DateTime.Now)
+        //    Console.WriteLine("进入保存每日采购数和售出数");
+        //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
         //    {
-        //        Console.WriteLine(start.ToString("yyyy-MM-dd"));
-        //        new Services().Init(start, start.AddDays(1));
-        //        start = start.AddDays(1);
-        //    }
+        //        services.AddHostedService<Services>();
+        //    });
 
+        //    await builder.RunConsoleAsync();
         //}
 
+        static void Main(string[] args)
+        {
+            var start = DateTime.Parse("2019-10-20");
+            while (start.AddDays(1) < DateTime.Now)
+            {
+                Console.WriteLine(start.ToString("yyyy-MM-dd"));
+                new Services().Init(start, start.AddDays(1));
+                start = start.AddDays(1);
+            }
+
+        }
+
     }
 }

Bailun.DC.SkuDailyPurchaseAndSales/Services.cs

@@ -259,11 +259,11 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
 
                 //出库 =(生产消耗-取消生产)
                 sql = $@"select t1.material_code as bailun_sku,t1.warehouse_id as warehouse_code,t1.warehouse_name as warehouse_name,sum(t1.stock) as count,sum(t1.stock*t1.new_price) amount from dc_semi_stock_report t1 
-                        where t1.stock_type=3 and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' group by t1.material_code,t1.warehouse_id;";
+                        where t1.is_zichang=0 and t1.stock_type=3 and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' group by t1.material_code,t1.warehouse_id;";
                 var objSemiProduction = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();  //生产消耗
 
                 sql = $@"select t1.material_code as bailun_sku,t1.warehouse_id as warehouse_code,t1.warehouse_name as warehouse_name,sum(t1.stock) as count,sum(t1.stock*t1.new_price) amount from dc_semi_stock_report t1 
-                        where t1.stock_type=5 and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' group by t1.material_code,t1.warehouse_id;";
+                        where t1.is_zichang=0 and t1.stock_type=5 and t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' group by t1.material_code,t1.warehouse_id;";
                 var objSemiCancelProduction = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();  //取消生产
 
                 //生产消耗-取消生产

docker-compose.yml

@@ -55,3 +55,10 @@ services:
       context: .
       dockerfile: Bailun.DC.HappenAmount/Dockerfile
 
+
+  bailun.dc.dailypayandincoming:
+    image: ${DOCKER_REGISTRY}bailundcdailypayandincoming
+    build:
+      context: .
+      dockerfile: ../Bailun.DC.DailyPayAndIncoming/Dockerfile
+