Эх сурвалжийг харах

1. 關閉台泥開始充電回調任務 (移到KernelServer)
2.充電記錄回傳 費率 收據 總花費

Jessica Tseng 3 жил өмнө
parent
commit
809475e9c3

+ 3 - 0
EVCB_OCPP.TaskScheduler/Jobs/StartTransacionReportJob.cs

@@ -44,6 +44,9 @@ namespace EVCB_OCPP.TaskScheduler.Jobs
 
         private void DoMainTask(Guid customerId)
         {
+            if (customerId == new Guid("009E603C-79CD-4620-A2B8-D9349C0E8AD8")) return;
+
+
             ICustomerService _service = CustomerBackendFactory.Create(customerId);
             _service.ReportStartTransaction().Wait();
         }

+ 15 - 0
EVCB_OCPP.TaskScheduler/Models/Transaction.cs

@@ -107,5 +107,20 @@ namespace EVCB_OCPP.TaskScheduler.Models
         /// </summary>
         public string ErrorMsg { set; get; }
 
+        /// <summary>
+        ///費率
+        /// </summary>
+        public string Fee { set; get; }
+
+
+
+        /// <summary>
+        /// 收據
+        /// </summary>
+        public string Receipt { set; get; }
+
+
+        public decimal Cost { set; get; }
+
     }
 }

+ 4 - 1
EVCB_OCPP.TaskScheduler/Services/CommonCustomerService.cs

@@ -230,7 +230,10 @@ namespace EVCB_OCPP.TaskScheduler.Services
                                 IdTag = r.StartIdTag,
                                 StartTime = r.StartTime.ToString(DefaultSetting.UTC_DATETIMEFORMAT),
                                 StopTime = r.StopTime.ToString(DefaultSetting.UTC_DATETIMEFORMAT),
-                                StopReason = r.StopReasonId < 1 ? "Unknown" : (r.StopReasonId > 12 ? "Unknown" : ((Reason)r.StopReasonId).ToString())
+                                StopReason = r.StopReasonId < 1 ? "Unknown" : (r.StopReasonId > 12 ? "Unknown" : ((Reason)r.StopReasonId).ToString()),
+                                Receipt = r.Receipt,
+                                TotalCost = r.Cost,
+                                Fee = r.Fee
 
                             };
 

+ 1 - 1
EVCB_OCPP.TaskScheduler/Services/DatabaseService.cs

@@ -126,7 +126,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
                     }
                     else
                     {
-                        sqlString = "SELECT Top(" + size + ") Id,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId FROM [dbo].[TransactionRecord] where CustomerId=@CustomerId and StopTime!='1991/1/1' and StopTransactionReportedOn='1991/1/1' ";
+                        sqlString = "SELECT Top(" + size + ") Id,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee FROM [dbo].[TransactionRecord] where CustomerId=@CustomerId and StopTime!='1991/1/1' and StopTransactionReportedOn='1991/1/1' ";
                     }
 
                     result = dbConn.Query<Transaction>(sqlString, parameters).ToList();