新增佔用費相關流程

EVCB_OCPP.WSServer/GitVersion.yml

@@ -1,7 +1,5 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
 next-version: 0.1.0
-branches:
-  master:
 ignore:
   sha: []

EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -78,9 +78,9 @@ namespace EVCB_OCPP.WSServer.Message
 
         public string occupancySN { set; get; }
 
-        public string chargeEndTime { set; get; }
+        public string startTime { set; get; }
 
-        public int occupancyDuration { set; get; }
+        public int duration { set; get; }
 
 
         public decimal occupancyFee { set; get; }
@@ -228,13 +228,13 @@ namespace EVCB_OCPP.WSServer.Message
                                     JObject jo = JObject.Parse(_httpResult.Data);
                                     if (jo.ContainsKey("ChargeEndTime"))
                                     {
-                                        occupancyFeeResult.chargeEndTime = jo["ChargeEndTime"].Value<string>();
+                                        occupancyFeeResult.startTime = jo["ChargeEndTime"].Value<string>();
 
                                     }
 
                                     if (jo.ContainsKey("OccupancyDuration"))
                                     {
-                                        occupancyFeeResult.occupancyDuration = jo["OccupancyDuration"].Value<int>();
+                                        occupancyFeeResult.duration = jo["OccupancyDuration"].Value<int>();
                                     }
 
 
@@ -247,7 +247,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 confirm.status = DataTransferStatus.Accepted;
                                 confirm.data = JsonConvert.SerializeObject(occupancyFeeResult);
                             }
-                            if (_request.messageId == "ID_OccupancyFeeResult")
+                            if (_request.messageId == "ID_OccupancyDeductResult")
                             {
 
                                 var occupancyFeeResult = JsonConvert.DeserializeObject<ID_OccupancyFeeResult>(_request.data);

EVCB_OCPP.WSServer/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("86d7446")]
+[assembly: AssemblyInformationalVersion("238ef3e")]

EVCB_OCPP.WSServer/ProtalServer.cs

@@ -1802,7 +1802,7 @@ namespace EVCB_OCPP.WSServer
                                                     vendorId = "Phihong Technology",
                                                     data = JsonConvert.SerializeObject(new
                                                     {
-                                                        price = session.DisplayParkingPrice
+                                                        price = Convert.ToDouble(session.DisplayParkingPrice)
 
                                                     })
 
@@ -1923,7 +1923,7 @@ namespace EVCB_OCPP.WSServer
                         }
                     }
 
-                    displayPriceText = string.Format("{0};{1} {2}/min", stationPrice.FeeName, stationPrice.ParkingFee, client.Currency);
+                    displayPriceText = string.Format("{0};{1}", stationPrice.FeeName, stationPrice.ParkingFee);
                     client.BillingMethod = stationPrice.BillingMethod;
                     client.Currency = stationPrice.Currency;
                     client.ChargingFeebyHour = stationPrice.ChargingFeebyHour;