소스 검색

1. 拿掉下發費率的DebugLog
2.Fix 找不到費率時候的回 empty

Jessica Tseng 3 년 전
부모
커밋
a89677ab02
2개의 변경된 파일8개의 추가작업 그리고 7개의 파일을 삭제
  1. 4 4
      EVCB_OCPP.WSServer/Properties/AssemblyInfo.cs
  2. 4 3
      EVCB_OCPP.WSServer/ProtalServer.cs

+ 4 - 4
EVCB_OCPP.WSServer/Properties/AssemblyInfo.cs

@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值,或將組建編號或修訂編號設為預設值
 // 指定為預設值: 
-// [assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+// [assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
 
-[assembly: AssemblyInformationalVersion("6d8b692")]
+[assembly: AssemblyInformationalVersion("499dc33")]

+ 4 - 3
EVCB_OCPP.WSServer/ProtalServer.cs

@@ -1825,7 +1825,7 @@ namespace EVCB_OCPP.WSServer
                 parameters.Add("@MachineId", client.MachineId, DbType.String, ParameterDirection.Input);
                 string displayPricestrSql = "";
                 string strSql = "";
-                logger.Debug(client.MachineId + " " + client.IsAC);
+               
                 if (client.IsAC)
                 {
                     displayPricestrSql = "   SELECT  [AC_BillingMethod] as BillingMethod,[AC_FeeName] as FeeName,[AC_Fee] as ChargingFeebyHour" +
@@ -1846,11 +1846,12 @@ namespace EVCB_OCPP.WSServer
 
                 }
                 var result = await conn.QueryAsync<StationFee>(displayPricestrSql, parameters);
-                var stationPrice = result.First();
-                if (stationPrice == null)
+                if (result.Count() == 0)
                 {
                     return string.Empty;
                 }
+                var stationPrice = result.First();
+              
                 if (stationPrice.BillingMethod == 1)
                 {
                     var chargingPriceResult = await conn.QueryAsync<ChargingPrice>(strSql, parameters);