调整同步物流费用接口

Bailun.DC.Models/dc_base_finance_fee.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    public class dc_base_finance_fee
+    {
+        /// <summary>
+        /// 费用单表 id
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 计划编号
+        /// </summary>
+        public string cost_plan_no { get; set; }
+
+
+        /// <summary>
+        /// 费用单编号
+        /// </summary>
+        public string cost_no { get; set; }
+
+
+        /// <summary>
+        /// 付款理由
+        /// </summary>
+        public string cost_reason { get; set; }
+
+
+        /// <summary>
+        /// 费用类 1付款  2收款  3借支/借还
+        /// </summary>
+        public int? cost_form { get; set; }
+
+
+        /// <summary>
+        /// 主体编号
+        /// </summary>
+        public string company_no { get; set; }
+
+
+        /// <summary>
+        /// 主体名称
+        /// </summary>
+        public string company_name { get; set; }
+
+
+        /// <summary>
+        /// 大类编号
+        /// </summary>
+        public string type_no { get; set; }
+
+
+        /// <summary>
+        /// 大类标题
+        /// </summary>
+        public string type_name { get; set; }
+
+
+        /// <summary>
+        /// 小类编号
+        /// </summary>
+        public string kind_no { get; set; }
+
+
+        /// <summary>
+        /// 小类标题
+        /// </summary>
+        public string kind_name { get; set; }
+
+
+        /// <summary>
+        /// 创建人 id
+        /// </summary>
+        public int? create_userid { get; set; }
+
+
+        /// <summary>
+        /// 创建人编号
+        /// </summary>
+        public string create_usercode { get; set; }
+
+
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        public string create_username { get; set; }
+
+
+        /// <summary>
+        /// 费用单备注
+        /// </summary>
+        public string cost_remark { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+
+        /// <summary>
+        /// 费用单状态 0 待提交 1待审核 2待出纳付款 3被驳回 4已支付 5已作废
+        /// </summary>
+        public int? cost_status { get; set; }
+
+
+        /// <summary>
+        /// 文件地址
+        /// </summary>
+        public string file_path { get; set; }
+
+
+        /// <summary>
+        /// 补充材料地址
+        /// </summary>
+        public string mor_file_path { get; set; }
+
+
+        /// <summary>
+        /// 费用总金额
+        /// </summary>
+        public decimal? amount { get; set; }
+
+
+        /// <summary>
+        /// 收款/付款银行（或支付宝）
+        /// </summary>
+        public string bank_name { get; set; }
+
+
+        /// <summary>
+        /// 收款/付款账号
+        /// </summary>
+        public string bank_card { get; set; }
+
+
+        /// <summary>
+        /// 收款/付款人（创建人）
+        /// </summary>
+        public string bank_card_user { get; set; }
+
+
+        /// <summary>
+        /// 收款/付款单位
+        /// </summary>
+        public string bank_company { get; set; }
+
+
+        /// <summary>
+        /// 补充信息
+        /// </summary>
+        public string mor_remark { get; set; }
+
+
+        /// <summary>
+        /// 关联子单
+        /// </summary>
+        public string son_cost_no { get; set; }
+
+
+        /// <summary>
+        /// 关联父单
+        /// </summary>
+        public string sup_cost_no { get; set; }
+
+
+        /// <summary>
+        /// 1 借支 2 借还
+        /// </summary>
+        public int? is_lend { get; set; }
+
+
+        /// <summary>
+        /// 借支单已还金额
+        /// </summary>
+        public decimal? had_pay { get; set; }
+
+
+        /// <summary>
+        /// 借支单状态 1 未还 2 部分还款  3 待补差额  4 结清
+        /// </summary>
+        public int? lend_status { get; set; }
+
+
+        /// <summary>
+        /// 借支单补偿金额
+        /// </summary>
+        public decimal? compensate { get; set; }
+
+
+        /// <summary>
+        /// 借还单冲销金额
+        /// </summary>
+        public decimal? counteract { get; set; }
+
+
+        /// <summary>
+        /// 借还单余额
+        /// </summary>
+        public decimal? lend_balance { get; set; }
+
+
+        /// <summary>
+        /// 驳回理由
+        /// </summary>
+        public string reject_reason { get; set; }
+
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string dic { get; set; }
+
+
+        /// <summary>
+        /// 借还单冲销金额 ( 支付币种 )
+        /// </summary>
+        public decimal? pay_counteract { get; set; }
+
+
+        /// <summary>
+        /// 借还单余额 （ 支付币种 ）
+        /// </summary>
+        public decimal? pay_lend_balance { get; set; }
+
+
+        /// <summary>
+        /// 计划金额 （ 支付币种 ）
+        /// </summary>
+        public decimal? pay_plan_amount { get; set; }
+
+
+        /// <summary>
+        /// 支付币种
+        /// </summary>
+        public string pay_dic { get; set; }
+
+
+        /// <summary>
+        /// 汇率
+        /// </summary>
+        public decimal? pay_cur { get; set; }
+
+
+        /// <summary>
+        /// 0 不抵扣个税  1 抵扣个税
+        /// </summary>
+        public int? is_tax { get; set; }
+
+
+        /// <summary>
+        /// 出纳系统 detailKey
+        /// </summary>
+        public string detail_key { get; set; }
+
+
+        /// <summary>
+        /// 支付者用户id
+        /// </summary>
+        public int? pay_user_id { get; set; }
+
+
+        /// <summary>
+        /// 支付时间
+        /// </summary>
+        public DateTime? pay_time { get; set; }
+
+
+        /// <summary>
+        /// 人民币总金额
+        /// </summary>
+        public decimal? amount_rmb { get; set; }
+
+
+        /// <summary>
+        /// xx货币转人民币汇率
+        /// </summary>
+        public decimal? to_rmb_rate { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? sub_logistics_supplier_id { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? logistics_supplier_id { get; set; }
+
+
+        /// <summary>
+        /// 科目编号
+        /// </summary>
+        public string subject_code { get; set; }
+
+
+        /// <summary>
+        /// 公司主体value
+        /// </summary>
+        public int? company_value { get; set; }
+
+
+        /// <summary>
+        /// 财务审核时间
+        /// </summary>
+        public DateTime? audit_time { get; set; }
+
+
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        public DateTime? last_modify_date { get; set; }
+
+
+        /// <summary>
+        /// 数据中心创建时间
+        /// </summary>
+        public DateTime bj_create { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime bj_modified { get; set; }
+
+
+
+    }
+}

Bailun.DC.MonthSaleProfit/Services.cs

@@ -734,7 +734,47 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
             };
 
 
+            var listFinance = new List<dc_base_finance_fee>();
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
+            {
+                if(cn.State== System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                listFinance = cn.Query<dc_base_finance_fee>($"select * from dc_base_finance_fee where company_name in ('（英国）4kmiles technologies ltd','香港四千里数据科技有限公司','YOUNGTOP INTERNATIONAL LIMITED','深圳市四千里数据科技有限公司','4Kmiles tec Limited','广州四千里数据科技有限公司') pay_time>='{day.ToString("yyyy-MM-dd")}' and pay_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'").ToList();
+            }
+
+
+
+            //营业收入=SAAS套餐收入+测评收入+DSP服务收入+MH代理收入+代运营收入+粉丝系统服务收入+其他收入
+            m.incoming_operating = m.incoming_operating_saas + m.incoming_operating_test + m.incoming_operating_dsp + m.incoming_operating_mh + m.incoming_operating_tp + m.incoming_operating_fansservice + m.incoming_operating_other;
+
+            //营业成本=IT人工成本+DSP渠道成本+DSP签约成本+代运营成本+MH客户成本
+            m.cost_operating = m.cost_operating_it + m.cost_operating_dspchannel + m.cost_operating_dspsign + m.cost_operating_tp + m.cost_operating_mh;
+
+            //营业利润=营业收入-营业成本-营业税金及附加-销售费用-管理费用-财务费用
+            m.profit_operating = m.incoming_operating - m.cost_operating - m.cost_operating_taxes - m.cost_operating_sales - m.cost_operating_manager - m.cost_operating_finance;
 
+            //利润总额=营业利润+营业外利润-营业务支出
+            m.profit = m.profit_operating + m.incoming_out_operating - m.cost_out_operating;
+
+            //净利润=利润总额-所得税费用
+            m.profit_retained = m.profit - m.fee_income_tax;
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                cn.Execute("delete from dc_month_sales_profit_4k where isedit=0 and month='" + m.month + "'");
+                var sql = $@"insert dc_month_sales_profit_4k () values 
+                        ()";
+
+                cn.Execute(sql);
+            }
 
         }
 

Bailun.DC.SyncLogisticInfo/Services.cs

@@ -52,11 +52,19 @@ namespace Bailun.DC.SyncLogisticInfo
 
                 var starttime = DateTime.Parse("2020-01-01");
                 var endtime = starttime.AddDays(1);
+                var currenttime = DateTime.Now;
+
+                
+                //starttime = DateTime.Parse("2020-09-05");
+                //endtime = starttime.AddDays(1);
+                
+                while(currenttime>endtime)
+                {
                     var page = 1;
                     var pagesize = 1000;
                     var total = -1;
 
-                using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+                    using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
                     {
                         if (cn.State == System.Data.ConnectionState.Closed)
                         {
@@ -77,13 +85,6 @@ namespace Bailun.DC.SyncLogisticInfo
                         starttime = DateTime.Now.AddMinutes(-2);
                     }
 
-                //starttime = DateTime.Parse("2020-09-05");
-                //endtime = starttime.AddDays(1);
-                if (endtime > DateTime.Now)
-                {
-                    endtime = DateTime.Now;
-                }
-
 
                     while (total == -1 || total > ((page - 1) * pagesize))
                     {
@@ -125,6 +126,9 @@ namespace Bailun.DC.SyncLogisticInfo
                         cn.Execute("update job_point_log set start_time='" + starttime.ToString("yyyy-MM-dd HH:mm:ss") + "',end_time='" + endtime.ToString("yyyy-MM-dd HH:mm:ss") + "' where job_name='dc-base-logisticinfo'");
 
                     }
+                }
+
+                
 
                 isRuning = false;
             }