|
@@ -190,10 +190,16 @@ public class CloudInfoHandler {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- //记录订单时间是否大于上一笔订单的时间,不是则为旧单或同一单,不上传
|
|
|
+ //油机数据会发送0元订单,00000000 00:00:00挂枪时间的单,这种过滤掉
|
|
|
String orderTime = fuelMsg.get(DataConfig.OrderConfig.date) + " " + fuelMsg.get(DataConfig.OrderConfig.time);
|
|
|
- String perOrderTime = FuelMsgCardNoHandler.getPerOrderTime(stationIp, gunNo_);
|
|
|
Date orderTimeDate = DateTimeUtils.parse(orderTime);
|
|
|
+ if ("0.00".equals(fuelMsg.get(DataConfig.OrderConfig.amount)) || (orderTimeDate != null && orderTimeDate.getTime() < 0)) {
|
|
|
+ log.info("订单数据错误,金额:" + fuelMsg.get(DataConfig.OrderConfig.amount) + " 时间:" + orderTime);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ //记录订单时间是否大于上一笔订单的时间,不是则为旧单或同一单,不上传
|
|
|
+ String perOrderTime = FuelMsgCardNoHandler.getPerOrderTime(stationIp, gunNo_);
|
|
|
Date perOrderTimeDate = DateTimeUtils.parse(perOrderTime);
|
|
|
if (orderTimeDate != null && perOrderTimeDate != null) {
|
|
|
int intervalSeconds = DateTimeUtils.getIntervalSeconds(perOrderTimeDate,orderTimeDate);
|