diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java index cedf9cbec..f25398ab2 100755 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java @@ -46,7 +46,8 @@ public class ETCPUtil { /** * 域名地址 */ - private static final String domain = "http://mapi.test.etcp.cn"; +// private static final String domain = "http://mapi.test.etcp.cn"; + private static final String domain = "http://mapi.etcp.cn"; // private static final String appId = "FMLK"; @@ -56,12 +57,15 @@ public class ETCPUtil { /** * 商户号 测试时请换成ETCP开放平台为商户平台分配的商户号 */ - private static final String merchantNo = "C7AEAF80BA8C44ADB42F3DB3CBC7D18A"; +// private static final String merchantNo = "C7AEAF80BA8C44ADB42F3DB3CBC7D18A"; + private static final String merchantNo = "24E6DD2767F44F75A4AD916ECBFE4FA1"; /** * 商户密钥 测试时请换成ETCP开放平台为商户平台分配的商户密钥 */ - private static final String merchantKey = "C292FFC7DCFB46AFB02792CD43F6DCC7"; +// private static final String merchantKey = "C292FFC7DCFB46AFB02792CD43F6DCC7"; + private static final String merchantKey = "B6751C6B37254C4390031F098738B5D9"; + /** * 接口服务版本号 @@ -246,7 +250,9 @@ public class ETCPUtil { //caller.bCouponRecord(domain, merchantNo, merchantKey, version, etcpToken, parkId, businessId, carNumber, couponFreeId); // 联合登录测试 - /*ret = caller.userSignin(domain, appId, merchantNo, merchantKey, version, "13910154397"); + //etcp 登陆 + ret = caller.userSignin(domain, appId, merchantNo, merchantKey, version, "13597837191"); + System.out.println(ret); objret = JSON.parseObject(ret); if (objret.getIntValue("code") != 0) @@ -254,38 +260,37 @@ public class ETCPUtil { etcpToken = objret.getJSONObject("data").getString("token"); System.out.println(etcpToken); - */ - // 绑定车牌查询 + // 绑定的车牌查询 ret = caller.carNum(domain, merchantNo, merchantKey, version, etcpToken); System.out.println(ret); - objret = JSON.parseObject(ret); - if (objret.getIntValue("code") != 0) - return; - JSONObject data = objret.getJSONObject("data"); - if (data.getIntValue("number") <= 0) { - // 车牌绑定测试 - ret = caller.bindCar(domain, etcpToken, carNumber, null, merchantNo, merchantKey, version); - objret = JSON.parseObject(ret); - if (objret.getIntValue("code") != 0) - return; - } - JSONArray carArry = data.getJSONArray("carList"); - carNumber = JSON.toJSONString(carArry.get(0)); - carNumber = carNumber.substring(1, carNumber.length() -1); - System.out.println(carNumber); - // 停车费查询 - ret = caller.orderUnpay(domain, appId, merchantNo, merchantKey, version, etcpToken, carNumber); - System.out.println(ret); - objret = JSON.parseObject(ret); - if (objret.getIntValue("code") != 0) - return; - JSONArray payArr = objret.getJSONArray("data"); - JSONObject payObj = payArr.getJSONObject(0); - String orderId = payObj.getString("orderId"); - // 微信h5支付 - ret = caller.orderPay(domain, merchantNo, merchantKey, version, etcpToken, orderId, "http://test.cn", null); - System.out.println(ret); +// objret = JSON.parseObject(ret); +// if (objret.getIntValue("code") != 0) +// return; +// JSONObject data = objret.getJSONObject("data"); +// if (data.getIntValue("number") <= 0) { +// // 车牌绑定测试 +// ret = caller.bindCar(domain, etcpToken, carNumber, null, merchantNo, merchantKey, version); +// objret = JSON.parseObject(ret); +// if (objret.getIntValue("code") != 0) +// return; +// } +// JSONArray carArry = data.getJSONArray("carList"); +// carNumber = JSON.toJSONString(carArry.get(0)); +// carNumber = carNumber.substring(1, carNumber.length() -1); +// System.out.println(carNumber); +// // 停车费查询 +// ret = caller.orderUnpay(domain, appId, merchantNo, merchantKey, version, etcpToken, carNumber); +// System.out.println(ret); +// objret = JSON.parseObject(ret); +// if (objret.getIntValue("code") != 0) +// return; +// JSONArray payArr = objret.getJSONArray("data"); +// JSONObject payObj = payArr.getJSONObject(0); +// String orderId = payObj.getString("orderId"); +// // 微信h5支付 +// ret = caller.orderPay(domain, merchantNo, merchantKey, version, etcpToken, orderId, "http://test.cn", null); +// System.out.println(ret); // 车牌解绑测试 //caller.unbindCar(merchantNo, merchantKey, version, etcpToken, carNumber);