From 79ddb6d25da6275c582f4e8b74a580c76710a2f0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 15 Oct 2018 22:02:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=9C=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCarController.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index a50b78381..c597d6ae5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -675,7 +675,7 @@ public class WxCarController extends BaseController { } @ApiOperation("券包分页列表接口") - @GetMapping("couponOrderList") + @GetMapping("/couponOrderList") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @@ -697,4 +697,31 @@ public class WxCarController extends BaseController { wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); return wxCouponOrderService.carlistCUserVoAsPage(wxCouponOrder, pageNum, pageSize); } + + @ApiOperation(value = "停车场状态") + @GetMapping("/getParkStatus") + public ResultData getParkStatus() { + WxCUser user = getUser(); + /// 1, get mall's park + WxPark park = getCurrentPark(user); + if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { + String params = park.getVendorParams(); + JSONObject objParams = JSON.parseObject(params); + String url = objParams.getString("url"); + String merchantNo = objParams.getString("merchantNo"); + String merchantKey = objParams.getString("merchantKey"); + String version = objParams.getString("version"); + + + String ret = etcp.parkingStatus(url, merchantNo, merchantKey, version, park.getParkId()); + + JSONObject retObj = JSON.parseObject(ret); + if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { + return new ResultData(retObj.getJSONArray("data").getJSONObject(0)); + } + } + return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "车场不支持"); + } + + }