diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java index e596f9a7..f34c15ae 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java @@ -177,10 +177,20 @@ public interface XhpcChargeOrderMapper { @Param(value = "chargingAmt") Integer chargingAmt, @Param(value = "plateNum") String plateNum, @Param(value = "status") Integer status, - @Param(value = "createTime") Date createTime); + @Param(value = "createTime") Date createTime, + @Param(value = "rateModelId") Long rateModelId, + @Param(value = "terminalId") Long terminalId, + @Param(value = "power") Double power, + @Param(value = "chargingStationId") Long chargingStationId, + @Param(value = "chargingMode") String chargingMode); /** * 标记异常大于创建4小时,标记为异常 */ - void updateStatus(); +// void updateStatus(); + List> selectDate3rdNeedBy(@Param(value = "serialNumber") String serialNumber); + + String select3rdNameBy(@Param(value = "operatorIdEvcs") String 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 40ed3923..9a9c1b87 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 @@ -472,7 +472,13 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { return r; } String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss"); - int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status, date); + Map extraData = xhpcChargeOrderMapper.selectDate3rdNeedBy(connectorId).get(0); + Long rateModelId = (Long) extraData.get("rateModelId"); + Long terminalId = (Long) extraData.get("terminalId"); + Double power = (Double) extraData.get("power"); + Long chargingStationId = (Long) extraData.get("chargingStationId"); + String chargingMode = xhpcChargeOrderMapper.select3rdNameBy(internetSerialNumber.substring(0, 9)); + int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status, date, rateModelId, terminalId, power, chargingStationId, chargingMode); Map data = new HashMap<>(); System.out.println(res); if (res != 0) { diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index d306878e..8c69a12d 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -504,7 +504,22 @@ Plate_num, - status,source,create_time) + status,source,create_time, + + rate_model_id, + + + terminal_id, + + + power, + + + charging_station_id, + + + charging_mode + ) values (#{internetSerialNumber}, #{serialNum}, @@ -517,8 +532,43 @@ #{plateNum}, - #{status},1,#{createTime}) + #{status},1,#{createTime} + + ,#{rateModelId} + + + ,#{terminalId} + + + ,#{power} + + + ,#{chargingStationId} + + + ,#{chargingMode} + + ) + + + +