From 7676c6303e3a972c5248e8bd7392ef5e69374cd1 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 3 Sep 2018 21:21:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=88=B8=E9=A2=86=E5=8F=96]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E5=81=9C=E8=BD=A6=E5=88=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/controller/WxCarController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 1980bd80f..7895c05f8 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -587,7 +587,7 @@ public class WxCarController extends BaseController * 优免券领取 * 优免券不可退 */ - @ApiOperation(value = "优免券领取", notes="ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\",\"couponFreeId\":\"string\"},输出\n{}") + @ApiOperation(value = "优免券领取", notes="ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\",\"couponFreeId\":\"string\",\"merchantId\":\"string\"},输出\n{}") @PostMapping("/getCoupon") public ResultData getCoupon(@RequestBody Map paramMap) { WxCUser user = getUser(); @@ -616,7 +616,6 @@ public class WxCarController extends BaseController String merchantNo = objParams.getString("merchantNo"); String merchantKey = objParams.getString("merchantKey"); String version = objParams.getString("version"); - String parkId = objParams.getString("parkId"); String businessId = ""; // 优先从从商户表里取 businessId = getETCPBusinessID(merchantIdStr); @@ -626,7 +625,7 @@ public class WxCarController extends BaseController } String ret = etcp.bCouponRecord(url, merchantNo, merchantKey, version, - etcpToken, parkId, businessId, carNumber, couponFreeId); + etcpToken, park.getParkId(), businessId, carNumber, couponFreeId); JSONObject retObj = JSON.parseObject(ret); if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { return new ResultData();