解决利息取数重复的问题；把到货改为到货入库

Bailun.DC.DailyPayAndIncoming/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.DailyPayAndIncoming
         //{
         //    var _services = new Services();
 
-        //    var start = DateTime.Parse("2019-09-01");
+        //    var start = DateTime.Parse("2019-10-01");
         //    while (start < DateTime.Now)
         //    {
 

Bailun.DC.DailyPayAndIncoming/Services.cs

@@ -61,7 +61,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
 
             url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
-            cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd");
+            cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.AddDays(-1).ToString("yyyy-MM-dd");
             
             //利息支出
             var listInterest = ListInterestExpense(cwurl);
@@ -123,7 +123,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
 
             url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
-            cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd");
+            cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.AddDays(-1).ToString("yyyy-MM-dd");
 
             //利息支出
             var listInterest = ListInterestExpense(cwurl);
@@ -156,8 +156,8 @@ namespace Bailun.DC.DailyPayAndIncoming
                 sql = $@"select sum(cashier_paymoneyrmb) as amount from dc_base_finance_cashier where cashier_status=1 and cashier_type=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'  and ((sourcecode in ('Buy','SemiFinishedProduct') and companymain_value_from !=14 and companymain_value_from!=48) or (tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','广州美甲生产仓') and companymain_value_from in (1,2,5,7,8) and sourcecode in ('newCost','IncomeAndExpenditure')))";
                 var objPayed = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
 
-                //到货
-                sql = $@"select sum(t1.count*t2.unit_price) amount from dc_base_purchase_arrival t1
+                //到货入库
+                sql = $@"select sum(t1.count*t2.unit_price) amount from dc_base_purchase_inbound t1
                         join dc_base_purchase_details t2 on t1.purchase_id=t2.purchase_id and t1.bailun_sku=t2.bailun_sku
                         where t1.create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
                 var objArrival = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);