fix

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -50,6 +50,14 @@ namespace AutoTurnOver.DB
                     {
                         try
                         {
+                            var item_no = order_item.bailun_order_id;
+
+                            var old_cash_flow_list = conn.Query<old_cash_flow_dto>(" select data_type,id from dc_report_cash_flow_log where  bailun_sku=@bailun_sku and item_no=@item_no ", new
+                            {
+                                bailun_sku = order_item.bailun_sku,
+                                item_no = item_no
+                            });
+
                             #region PayPal费
 
                             dc_report_cash_flow_log item8 = new dc_report_cash_flow_log()
@@ -71,12 +79,7 @@ namespace AutoTurnOver.DB
                             item8.occur_time_year_month_no = $"{item8.occur_time.Year}-{item8.occur_time.Month}-{item8.bailun_sku}";
                             item8.pay_time_year_month_no = $"{item8.pay_time.Year}-{item8.pay_time.Month}-{item8.bailun_sku}";
                             item8.pay_time = CalculationPayTime(configs, item8.occur_time, item8.data_type, item8.platform_type);
-                            item8.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item8.data_type,
-                                bailun_sku = item8.bailun_sku,
-                                item_no = item8.item_no
-                            }) ?? 0;
+                            item8.id = (old_cash_flow_list.FirstOrDefault(s=>s.data_type==item8.data_type)??new old_cash_flow_dto()).id;
                             if (item8.id > 0)
                             {
                                 conn.Update(item8);
@@ -109,12 +112,7 @@ namespace AutoTurnOver.DB
                             item7.occur_time_year_month_no = $"{item7.occur_time.Year}-{item7.occur_time.Month}-{item7.bailun_sku}";
                             item7.pay_time_year_month_no = $"{item7.pay_time.Year}-{item7.pay_time.Month}-{item7.bailun_sku}";
                             item7.pay_time = CalculationPayTime(configs, item7.occur_time, item7.data_type, item7.platform_type);
-                            item7.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item7.data_type,
-                                bailun_sku = item7.bailun_sku,
-                                item_no = item7.item_no
-                            }) ?? 0;
+                            item7.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item7.data_type) ?? new old_cash_flow_dto()).id;
                             if (item7.id > 0)
                             {
                                 conn.Update(item7);
@@ -147,12 +145,7 @@ namespace AutoTurnOver.DB
                             item6.occur_time_year_month_no = $"{item6.occur_time.Year}-{item6.occur_time.Month}-{item6.bailun_sku}";
                             item6.pay_time_year_month_no = $"{item6.pay_time.Year}-{item6.pay_time.Month}-{item6.bailun_sku}";
                             item6.pay_time = CalculationPayTime(configs, item6.occur_time, item6.data_type, item6.platform_type);
-                            item6.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item6.data_type,
-                                bailun_sku = item6.bailun_sku,
-                                item_no = item6.item_no
-                            }) ?? 0;
+                            item6.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item6.data_type) ?? new old_cash_flow_dto()).id;
                             if (item6.id > 0)
                             {
                                 conn.Update(item6);
@@ -185,12 +178,7 @@ namespace AutoTurnOver.DB
                             item5.occur_time_year_month_no = $"{item5.occur_time.Year}-{item5.occur_time.Month}-{item5.bailun_sku}";
                             item5.pay_time_year_month_no = $"{item5.pay_time.Year}-{item5.pay_time.Month}-{item5.bailun_sku}";
                             item5.pay_time = CalculationPayTime(configs, item5.occur_time, item5.data_type, item5.platform_type);
-                            item5.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item5.data_type,
-                                bailun_sku = item5.bailun_sku,
-                                item_no = item5.item_no
-                            }) ?? 0;
+                            item5.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item5.data_type) ?? new old_cash_flow_dto()).id;
                             if (item5.id > 0)
                             {
                                 conn.Update(item5);
@@ -223,12 +211,7 @@ namespace AutoTurnOver.DB
                             item3.occur_time_year_month_no = $"{item3.occur_time.Year}-{item3.occur_time.Month}-{item3.bailun_sku}";
                             item3.pay_time_year_month_no = $"{item3.pay_time.Year}-{item3.pay_time.Month}-{item3.bailun_sku}";
                             item3.pay_time = CalculationPayTime(configs, item3.occur_time, item3.data_type, item3.platform_type);
-                            item3.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item3.data_type,
-                                bailun_sku = item3.bailun_sku,
-                                item_no = item3.item_no
-                            }) ?? 0;
+                            item3.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item3.data_type) ?? new old_cash_flow_dto()).id;
                             if (item3.id > 0)
                             {
                                 conn.Update(item3);
@@ -261,12 +244,7 @@ namespace AutoTurnOver.DB
                             item2.occur_time_year_month_no = $"{item2.occur_time.Year}-{item2.occur_time.Month}-{item2.bailun_sku}";
                             item2.pay_time_year_month_no = $"{item2.pay_time.Year}-{item2.pay_time.Month}-{item2.bailun_sku}";
                             item2.pay_time = CalculationPayTime(configs, item2.occur_time, item2.data_type, item2.platform_type);
-                            item2.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item2.data_type,
-                                bailun_sku = item2.bailun_sku,
-                                item_no = item2.item_no
-                            }) ?? 0;
+                            item2.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item2.data_type) ?? new old_cash_flow_dto()).id;
                             if (item2.id > 0)
                             {
                                 conn.Update(item2);
@@ -299,12 +277,7 @@ namespace AutoTurnOver.DB
                             item1.occur_time_year_month_no = $"{item1.occur_time.Year}-{item1.occur_time.Month}-{item1.bailun_sku}";
                             item1.pay_time_year_month_no = $"{item1.pay_time.Year}-{item1.pay_time.Month}-{item1.bailun_sku}";
                             item1.pay_time = CalculationPayTime(configs, item1.occur_time, item1.data_type, item1.platform_type);
-                            item1.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item1.data_type,
-                                bailun_sku = item1.bailun_sku,
-                                item_no = item1.item_no
-                            }) ?? 0;
+                            item1.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item1.data_type) ?? new old_cash_flow_dto()).id;
                             if (item1.id > 0)
                             {
                                 conn.Update(item1);
@@ -337,12 +310,7 @@ namespace AutoTurnOver.DB
                             item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.bailun_sku}";
                             item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.bailun_sku}";
                             item.pay_time = CalculationPayTime(configs, item.occur_time, item.data_type, item.platform_type);
-                            item.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
-                            {
-                                data_type = item.data_type,
-                                bailun_sku = item.bailun_sku,
-                                item_no = item.item_no
-                            }) ?? 0;
+                            item.id = (old_cash_flow_list.FirstOrDefault(s => s.data_type == item.data_type) ?? new old_cash_flow_dto()).id;
                             if (item.id > 0)
                             {
                                 conn.Update(item);

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -62,6 +62,12 @@ namespace AutoTurnOver.Models
         public string occur_time_year_month_no { get; set; }
     }
 
+    public class old_cash_flow_dto
+    {
+        public int id { get; set; }
+        public int data_type { get; set; }
+    }
+
     public class dc_report_cash_flow_log_dto: dc_report_cash_flow_log
     {
         public string data_type_str