Procházet zdrojové kódy

FinalCost Receipt 因應CDFA 要求加入StopReason
順便移除台泥邏輯

Jessica Tseng před 2 roky
rodič
revize
db5434d1ac

+ 6 - 17
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -1019,25 +1019,14 @@ namespace EVCB_OCPP.WSServer.Message
 
                                             }
 
-                                            if (session.CustomerId == new Guid("009E603C-79CD-4620-A2B8-D9349C0E8AD8"))
-                                            {
-                                                chargingCost = confirmbill.Count > 0 ? confirmbill.Sum(x => x.Total) : chargingCost;
-                                                chargingCost = chargedEnergy == 0 ? 0 : (chargingCost + parkingCost < 1 ? 1 : chargingCost);  //台泥最低一元
-                                                receipt += string.Format("|Total Energy Fee : ${0}", chargingCost);
+                                            chargingCost = confirmbill.Count > 0 ? confirmbill.Sum(x => x.Total) : chargingCost;
+                                            receipt += string.Format("|Total Energy Fee : ${0}", chargingCost);
 
-                                                receipt += string.Format("|Parking Fee: | {0} - {1} @ ${2}/hr=${3}", feedto.StartTime.ToString("hh:mm tt", new CultureInfo("en-us")),
-                                                feedto.StopTime.ToString("hh:mm tt", new CultureInfo("en-us")), parkingFee, parkingCost);
-                                                tx.Cost = chargingCost + parkingCost;
-                                            }
-                                            else
-                                            {
-                                                chargingCost = confirmbill.Count > 0 ? confirmbill.Sum(x => x.Total) : chargingCost;
-                                                receipt += string.Format("|Total Energy Fee : ${0}", chargingCost);
+                                            receipt += string.Format("|Parking Fee: | {0} - {1} @ ${2}/hr=${3}", feedto.StartTime.ToString("hh:mm tt", new CultureInfo("en-us")),
+                                            feedto.StopTime.ToString("hh:mm tt", new CultureInfo("en-us")), parkingFee, parkingCost);
+                                            receipt += string.Format("|Stop Reason: | {0}", tx.StopReason);
 
-                                                receipt += string.Format("|Parking Fee: | {0} - {1} @ ${2}/hr=${3}", feedto.StartTime.ToString("hh:mm tt", new CultureInfo("en-us")),
-                                                feedto.StopTime.ToString("hh:mm tt", new CultureInfo("en-us")), parkingFee, parkingCost);
-                                                tx.Cost = chargingCost + parkingCost;
-                                            }
+                                            tx.Cost = chargingCost + parkingCost;
 
 
                                             if (customerInfo != null && customerInfo.InstantStopTxReport)

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

@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值,或將組建編號或修訂編號設為預設值
 // 指定為預設值: 
-// [assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+// [assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
 
-[assembly: AssemblyInformationalVersion("92c630c")]
+[assembly: AssemblyInformationalVersion("0bc54e3")]