From 74b536117d5008fcef3a27eff19e4f7cc0e26e05 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 25 Nov 2020 14:37:09 +0800 Subject: [PATCH] fix bug --- .../park/impl/jieshun/JieShunParkService.java | 2 +- .../service/park/impl/jieshun/JieShunUtil.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index 4cd51f8e4..b4c5632a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -100,7 +100,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe /** * 先去捷顺注册,调用登陆获取令牌,然后根据令牌调用别的接口 - * api.jieshun.cn:9088/apply/ 注册信息地址 fumao/iformall2020 + * http://ap.jieshun.cn:9088/apply/ 注册信息地址 fumao/iformall2020 * * API对接注意事项: 1、token有效期两个小时,每两小时内登录一次获取token,调业务接口不需要频繁登录用,建议获取一次token存本地缓存,之后从本地获取,两小时内刷新一次, diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java index 163f1cc59..1318ba095 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java @@ -157,18 +157,20 @@ public class JieShunUtil { param.put("carNo", handleCarNumber(cardNumber)); Map map = generateMap("3c.pay.createorderbycarno",param); log.info("jieshun create order :" + JSON.toJSONString(map)); - return ProcBussiness(CREATE_ORDER, wxPark.getParkingId(), map, token); + return ProcBussiness(CREATE_ORDER, wxPark.getParkingId(), map, token,vp.getString("version")); } /** * 查询停车费 **/ public String getCarStopFee(WxPark wxPark,String orderNo,String token){ + String vendroParams = wxPark.getVendorParams(); + JSONObject vp = JSON.parseObject(vendroParams); Map param = new HashMap(); param.put("orderNo", orderNo);//商户编号 Map map = generateMap("3c.pay.queryorder",param); log.info("jieshun getCarStopFee :" + JSON.toJSONString(map)); - return ProcBussiness(QUERY_ORDER, wxPark.getParkingId(), map, token); + return ProcBussiness(QUERY_ORDER, wxPark.getParkingId(), map, token,vp.getString("version")); } @@ -186,7 +188,7 @@ public class JieShunUtil { param.put("tel", phone);//商户编号 Map map = generateMap("3c.coupons.receive.coupons",param); log.info("jieshun getCoupon :" + JSON.toJSONString(map)); - return ProcBussiness(GET_COUPON, wxPark.getParkingId(), map, token); + return ProcBussiness(GET_COUPON, wxPark.getParkingId(), map, token,vp.getString("version")); } @@ -204,7 +206,7 @@ public class JieShunUtil { param.put("parkCode", wxPark.getParkId()); Map map = generateMap("3c.coupons.use.coupons",param); log.info("jieshun useCoupon :" + JSON.toJSONString(map)); - return ProcBussiness(COUPON_USE, wxPark.getParkingId(), map, token); + return ProcBussiness(COUPON_USE, wxPark.getParkingId(), map, token,vp.getString("version")); } @@ -217,7 +219,7 @@ public class JieShunUtil { return Proc(TOKEN_URL,list); } - private static String ProcBussiness(String url,String cid,Map param,String token) { + private static String ProcBussiness(String url,String cid,Map param,String token,String version) { try { MessageDigest md5Tool = MessageDigest.getInstance("MD5"); String p = JSON.toJSONString(param); @@ -226,7 +228,7 @@ public class JieShunUtil { ArrayList list = new ArrayList(); list.add(new BasicNameValuePair("cid", cid)); - list.add(new BasicNameValuePair("v", "1.0"));//版本号 + list.add(new BasicNameValuePair("v", version));//版本号 list.add(new BasicNameValuePair("p",p)); list.add(new BasicNameValuePair("sn",sn)); if (!StringUtils.isBlank(token)) {