ソースを参照

add main branch commit
Commit db5434d1: FinalCost Receipt 因應CDFA 要求加入StopReason
順便移除台泥邏輯

Robert 1 年間 前
コミット
1e1207ce83
1 ファイル変更8 行追加19 行削除
  1. 8 19
      EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

+ 8 - 19
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -1056,25 +1056,14 @@ internal partial class ProfileHandler
 
                                         }
 
-                                        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);
-
-                                            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);
-                                            tx.Cost = chargingCost + parkingCost;
-                                        }
+                                        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);
+                                    
+                                        tx.Cost = chargingCost + parkingCost;
 
 
                                         if (customerInfo != null && customerInfo.InstantStopTxReport)