|
@@ -1859,68 +1859,14 @@ namespace EVCB_OCPP.WSServer
|
|
|
{
|
|
|
client.ChargingPrices = new List<ChargingPrice>();
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ }
|
|
|
|
|
|
displayPriceText = stationPrice.FeeName;
|
|
|
client.BillingMethod = stationPrice.BillingMethod;
|
|
|
client.Currency = stationPrice.Currency;
|
|
|
client.ChargingFeebyHour = stationPrice.ChargingFeebyHour;
|
|
|
client.ParkingFee = stationPrice.ParkingFee;
|
|
|
- client.IsBilling = true;
|
|
|
-
|
|
|
- logger.Debug(string.Format("displayPriceText:{0}\r\n client.BillingMethod:{1}\r\n client.Currency:{2}\r\nclient.ChargingFeebyHour:{3}\r\nclient.ParkingFee:{4}\r\n",
|
|
|
- displayPriceText, client.BillingMethod, client.Currency, client.ChargingFeebyHour, client.ParkingFee));
|
|
|
-
|
|
|
- // if (client.CustomerId == new Guid("009E603C-79CD-4620-A2B8-D9349C0E8AD8"))
|
|
|
- // {
|
|
|
- // if (displayPriceText.StartsWith("AC") || displayPriceText.StartsWith("DC"))
|
|
|
- // {
|
|
|
-
|
|
|
- // if (client.ChargeBoxId.StartsWith("D"))
|
|
|
- // {
|
|
|
-
|
|
|
- // var unitWords = displayPriceText.Split(';').ToList();
|
|
|
- // int dcIndex = unitWords.FindIndex(x => x.Contains("DC"));
|
|
|
- // displayPriceText = unitWords[dcIndex].Replace("DC:", "");
|
|
|
- // var priceText = displayPriceText.Split('$')[1].TrimStart(' ').Split('/')[0]; ;
|
|
|
- // var dc_UnitPrice = int.Parse(priceText);
|
|
|
- // client.ChargingPrices = new List<ChargingPrice>()
|
|
|
- // {
|
|
|
- // new ChargingPrice()
|
|
|
- // {
|
|
|
- // EndTime="23:59",
|
|
|
- // StartTime="00:00",
|
|
|
- // Fee=dc_UnitPrice
|
|
|
- // }
|
|
|
- // };
|
|
|
-
|
|
|
-
|
|
|
- // }
|
|
|
- // else
|
|
|
- // {
|
|
|
- // var unitWords = displayPriceText.Split(';').ToList();
|
|
|
- // int dcIndex = unitWords.FindIndex(x => x.Contains("AC"));
|
|
|
- // displayPriceText = unitWords[dcIndex].Replace("AC:", "");
|
|
|
- // var priceText = displayPriceText.Split('$')[1].TrimStart(' ').Split('/')[0]; ;
|
|
|
- // var ac_UnitPrice = int.Parse(priceText);
|
|
|
- // client.ChargingPrices = new List<ChargingPrice>()
|
|
|
- // {
|
|
|
- // new ChargingPrice()
|
|
|
- // {
|
|
|
- // EndTime="23:59",
|
|
|
- // StartTime="00:00",
|
|
|
- // Fee=ac_UnitPrice
|
|
|
- // }
|
|
|
- // };
|
|
|
- // Console.WriteLine("Chargeboxid=>" + client.ChargeBoxId);
|
|
|
- // }
|
|
|
-
|
|
|
-
|
|
|
- // }
|
|
|
-
|
|
|
- // }
|
|
|
+ client.IsBilling = true;
|
|
|
}
|
|
|
|
|
|
return displayPriceText;
|