diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java index 4ed08207..aedb1c3c 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java @@ -11,7 +11,7 @@ public class StartChargingData { private String pileNo; //桩号 @NotBlank(message = "枪号不能为空") private String gunId; //枪号 - @Min(value = 5, message = "账户余额不能小于5") + @Min(value = 500, message = "账户余额不能小于5.00元(500分)") private Integer balance; //账户余额(精度:小数点后2位)=实际金额(元)×100 private String tel; private String logicCardNo = "0000000000000000"; //逻辑卡号 16进制,无需补零 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index f5679998..275722e7 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -68,11 +68,15 @@ public class ChargingController { R r; JSONObject responseJson = (JSONObject) JSON.parse(response); - int code = responseJson.getInteger("code"); - if (code != 200) { - r = R.fail(code, responseJson.getString("msg")); + if (responseJson == null) { + r = R.fail("Native服务调用失败"); } else { - r = R.ok(responseJson.get("data"), responseJson.getString("msg")); + int code = responseJson.getInteger("code"); + if (code != 200) { + r = R.fail(code, responseJson.getString("msg")); + } else { + r = R.ok(responseJson.get("data"), responseJson.getString("msg")); + } } return r; }