diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java index f03aad8c..a318804f 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java @@ -62,6 +62,7 @@ public class QueryStartChargeController { gunStatus.put("orderNo", (String) res.getData()); REDIS.setCacheMap("gunStatus:", gunStatus); } + resp.setRet(String.valueOf(res.getCode())); } resp.setData(JSONUtil.toJSONString(startChargeResponse)); return resp; diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index eb851ddf..6a757642 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -420,11 +420,6 @@ public class XhpcPileOrderController extends BaseController { return userId; } - - - - - // private void rabbimt(String message) { // //发送消息队列 // try { 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 1d163c4b..8c60fdf1 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 @@ -355,11 +355,10 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { return r; } - if (chargingAmt == 0) chargingAmt = 500; StartChargingData startChargingData = new StartChargingData(); - - startChargingData.setBalance(chargingAmt); + //500000 equals 500 yuan + startChargingData.setBalance(500000); startChargingData.setGunId(connectorId); @@ -443,8 +442,8 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getCode() + ">>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getMsg() + ">>>>>>>>>>>>>>>>>"); if (r1.getCode() != 200) { - r1.setCode(500); - return r1; + r.setCode(500); + return r; } int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status); System.out.println(res); 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 a6ff1a47..d8ef8544 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -494,11 +494,11 @@ insert into xhpc_charge_order (internet_serial_number, - serial_num, - driverId, - chargingAmt, + serial_number, + driver_id, + charging_amt, - plateNum, + Plate_num, status,source) values