diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java index 6df37a5e..d8eefa3e 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java @@ -105,6 +105,66 @@ public class XhpcChargingStation extends BaseEntity { */ private String operatorIdEvcs; + /** + * 设备生产日期(格式YYYY-MM-DD) + */ + private String productionDate; + + /** + * 设备生产商名称 + */ + private String manufactrureName; + + /** + * 充电设备接口类型 + */ + private Integer connectorType; + + /** + * 额定电流(单位A) + */ + private Integer current; + + public String getProductionDate() { + + return productionDate; + } + + public void setProductionDate(String productionDate) { + + this.productionDate = productionDate; + } + + public String getManufactrureName() { + + return manufactrureName; + } + + public void setManufactrureName(String manufactrureName) { + + this.manufactrureName = manufactrureName; + } + + public Integer getConnectorType() { + + return connectorType; + } + + public void setConnectorType(Integer connectorType) { + + this.connectorType = connectorType; + } + + public Integer getCurrent() { + + return current; + } + + public void setCurrent(Integer current) { + + this.current = current; + } + public String getOperatorIdEvcs() { return operatorIdEvcs; 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 47465226..dbdc89ac 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 @@ -84,23 +84,23 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { if (serialNumber.length()!=16 || !m.matches()) { return AjaxResult.error(1104, "无效的终端编号"); } - //金额是否大于5元 + //查看充电用户金额是否大于5元 Map userMessage = xhpcChargeOrderMapper.getUserMessage(userId); BigDecimal a = new BigDecimal(5); if (userMessage == null || userMessage.get("balance") == null || a.compareTo(new BigDecimal(userMessage.get("balance").toString())) == 1) { return AjaxResult.error(1100, "金额小于5元,不能充电,请充值后再进行充电"); } - //是否有申请退款的订单,还未处理 + //查看充电用户是否有申请退款的订单,还未处理 if (Integer.parseInt(userMessage.get("isRefundApplication").toString()) != 0) { return AjaxResult.error(1101, "你有申请退款订单在审核中,需要充电请取消申请退款"); } - //是否在充电中 + //充电用户是否在充电中 String i = xhpcChargeOrderMapper.countXhpcRealTimeOrder(userId); if (!"".equals(i) && i!=null) { return AjaxResult.error(1102, "车辆正在充电,请查询车辆充电信息"); } - //是否存在异常的订单 + //充电用户是否存在异常的订单 int j = xhpcChargeOrderMapper.countXhpcChargeOrder(userId); if (j > 0) { return AjaxResult.error(1103, "你有异常订单未解决,请拨打客服电话进行解决");