From 71de55915f3ab816f98f4d2c02683886897d597c Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 17 Aug 2021 16:30:08 +0800 Subject: [PATCH] =?UTF-8?q?native=E8=B0=83=E7=94=A8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86;=E4=BD=99=E9=A2=9D=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=BA=94=E5=BD=93=E7=94=B1=E8=B0=83=E7=94=A8=E6=96=B9=E5=85=88?= =?UTF-8?q?=E6=8D=A2=E7=AE=97=E6=88=90=E5=88=86(1=3D0.01=E5=85=83)?= =?UTF-8?q?=E5=86=8D=E8=B0=83=E7=94=A8=E5=90=AF=E5=8A=A8=E5=85=85=E7=94=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/common/data/down/StartChargingData.java | 2 +- .../com/xhpc/pp/controller/ChargingController.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) 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; }