From 422a1e912f6f6432043f14805889080ee0803ac9 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 22 Aug 2018 10:52:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E5=A4=8D]:TJD?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/WxCarController.java | 9 +++++---- .../src/main/java/com/simple/enums/EnumTJDCode.java | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 284dbaf08..73a77364b 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -9,6 +9,7 @@ import com.simple.common.ResultData; import com.simple.domain.po.*; import com.simple.enums.EnumCarVendor; import com.simple.enums.EnumETCPCode; +import com.simple.enums.EnumTJDCode; import com.simple.service.WxCUserCarService; import com.simple.service.WxMerchantService; import com.simple.service.WxParkService; @@ -279,7 +280,7 @@ public class WxCarController extends BaseController carNumber, carNumColor, null, outCarId); JSONObject retObj = JSON.parseObject(ret); retObj.put("vendor", park.getVendorType()); - if (retObj.getString("returnCode") == "T") { + if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { String carId = retObj.getString("carId"); // 插入车牌 Date curr = new Date(); @@ -390,7 +391,7 @@ public class WxCarController extends BaseController String version = objParams.getString("version"); String ret = tjd.writeOffCar(url, partner, key, version, carId); JSONObject retObj = JSON.parseObject(ret); - if (retObj.getString("returnCode") == "T") { + if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { try { wxCUserCarService.deleteByObj(userCar); } catch (Exception e) { @@ -493,7 +494,7 @@ public class WxCarController extends BaseController String version = objParams.getString("version"); String ret = tjd.infoForFreeMins(url, partner, key, version, carNumber); JSONObject retObj = JSON.parseObject(ret); - if (retObj.getString("returnCode") == "T") { + if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { return new ResultData(retObj); } else { return new ResultData(ErrorCode.TJD_STOP_FEE_FAIL.getCode(), "停车费获取失败"); @@ -544,7 +545,7 @@ public class WxCarController extends BaseController String version = objParams.getString("version"); String ret = tjd.deductionNotSettle(url, partner, key, version, tradeId, deductionAmount, outTradeNo, accountId); JSONObject retObj = JSON.parseObject(ret); - if (retObj.getString("returnCode") == "T") { + if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { return new ResultData(); } else { return new ResultData(ErrorCode.TJD_DEDUCE_FEE_FAIL.getCode(), "停车费抵扣失败"); diff --git a/mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java b/mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java index 427bea0b5..358aa21ef 100644 --- a/mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java +++ b/mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java @@ -6,6 +6,7 @@ package com.simple.enums; public enum EnumTJDCode { SUCCESS(0, "T"), + FAIL(1, "F"), ; public static EnumTJDCode getEnum(Integer code) {