|
|
|
@@ -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<String, String > 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(); |
|
|
|
|