|
|
|
@@ -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<String,Object> param,String token) { |
|
|
|
private static String ProcBussiness(String url,String cid,Map<String,Object> param,String token,String version) { |
|
|
|
try { |
|
|
|
MessageDigest md5Tool = MessageDigest.getInstance("MD5"); |
|
|
|
String p = JSON.toJSONString(param); |
|
|
|
@@ -226,7 +228,7 @@ public class JieShunUtil { |
|
|
|
|
|
|
|
ArrayList<NameValuePair> list = new ArrayList<NameValuePair>(); |
|
|
|
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)) { |
|
|
|
|