From 8031059d31c353c57e62c85e8015b227dfb74661 Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 7 Jul 2022 11:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=AF=E5=8A=A8=E5=85=85?= =?UTF-8?q?=E7=94=B5=E5=88=A4=E6=96=AD=EF=BC=8C=E6=A1=A9=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=96=B9=E7=AC=AC=E4=B8=80=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/XhpcChargeOrderServiceImpl.java | 31 ++++++++++--------- .../impl/XhpcHistoryOrderServiceImpl.java | 2 +- .../mapper/XhpcHistoryOrderMapper.xml | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index a04dc56d..fe6dc11a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -156,6 +156,11 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar if (terminalSerialNumber.length() != 16 || !m.matches()) { return AjaxResult.error(1104, "无效的终端编号"); } + //终端信息 + XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(terminalSerialNumber,tenantId); + if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { + return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); + } //查看充电用户金额是否大于5元 //Map userMessage = xhpcChargeOrderMapper.getUserMessage(userId); BigDecimal a = new BigDecimal(5); @@ -206,11 +211,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar } } logger.info("<<<<<<<<<<<<<<<<<<<<<<<<终端编号>>>>"+terminalSerialNumber+">>>>>>>>>>>>>"+tenantId); - //终端信息 - XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(terminalSerialNumber,tenantId); - if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { - return AjaxResult.error(1104, "无效的终端编号"); - } + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<终端编号>>>>>>>>>>>>>>>>"); //余额 String balance = new BigDecimal(userMessage.get("balance").toString()).multiply(new BigDecimal(100)).toString(); @@ -335,7 +336,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(serialNumber,tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { - return AjaxResult.error(1104, "无效的终端编号"); + return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); } //获取桩信息 @@ -348,7 +349,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //获取充电订单号 XhpcChargeOrder order = xhpcChargeOrderMapper.getChargingOrderId(chargingOrderId); if(order ==null){ - return AjaxResult.error(1104, "无效的终端编号"); + return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); }else{ if(order.getSource()==1){ return AjaxResult.error(1104, "请在启动方停止充电"); @@ -486,7 +487,13 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar startChargingData.setTel(driverId); startChargingData.setPileNo(connectorId.substring(0, connectorId.length() - 3)); - + //终端信息 + XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(connectorId,null); + if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { + r.setCode(1); + r.setMsg("因限电该桩已停用,请选择其他桩进行充电"); + return r; + } //终端状态是否空闲 //是否插枪 Map cacheMap = REDIS.getCacheMap("gun:" + connectorId); @@ -531,13 +538,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar } } - //终端信息 - XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(connectorId,null); - if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { - r.setCode(1); - r.setMsg("无效的终端编号"); - return r; - } + //启动充电 //订单流水号 终端号+年月日时分秒+自增4位 共32位 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index d4de4379..a105c7f7 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -397,7 +397,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis writer.addHeaderAlias("updateTime", "结算时间"); writer.addHeaderAlias("chargingModeName", "订单来源"); writer.addHeaderAlias("stopReasonEvcs", "停止原因"); - + writer.addHeaderAlias("sourceName", "用户类型"); // writer.addHeaderAlias("plateNum", "电站名称"); // writer.addHeaderAlias("disputeOrderStatus", "桩编号"); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index a3dfc3ef..c0467ec3 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -993,7 +993,7 @@ left join xhpc_charge_order co on co.charge_order_id = ho.charge_order_id left join xhpc_charging_station cs on cs.charging_station_id = co.charging_station_id left join xhpc_terminal as te on te.terminal_id = ho.terminal_id - where ho.history_order_id not in (select history_order_id from xhpc_statistics_time_interval ) + where ho.history_order_id not in (select history_order_id from xhpc_statistics_station where type =2 ) and ho.total_price is not null and now() >DATE_ADD(ho.end_time,interval 6 hour) limit 0,#{number}