diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java index 132acb048..ff12659f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java @@ -137,7 +137,7 @@ public class DaHuaUtil { param.put("carNo", handleCarNumber(cardNumber)); Map map = generateMap("3c.pay.createorderbycarno",param); log.info("jieshunv2 create order :" + JSON.toJSONString(map)); - return ProcBussiness(CREATE_ORDER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); + return ProcBussiness(CREATE_ORDER, vp.getString("cid"), map, token); } /** @@ -150,7 +150,7 @@ public class DaHuaUtil { param.put("orderNo", orderNo);//商户编号 Map map = generateMap("3c.pay.queryorder",param); log.info("jieshunv2 getCarStopFee :" + JSON.toJSONString(map)); - return ProcBussiness(QUERY_ORDER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); + return ProcBussiness(QUERY_ORDER, vp.getString("cid"), map, token); } /** @@ -169,7 +169,7 @@ public class DaHuaUtil { param.put("password", sn.toLowerCase());//优惠券编号 Map map = generateMap("3c.discount.verifyuser",param); log.info("jieshunv2 verifyuser :" + JSON.toJSONString(map)); - return ProcBussiness(VERIFY_USER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); + return ProcBussiness(VERIFY_USER, vp.getString("cid"), map, token); } catch (NoSuchAlgorithmException e) { log.error("jieshunv2 verifyuser error.park:"+wxPark.getId(),e); throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"jieshunv2 verifyuser error.park:"+wxPark.getId()+".error"+e.getMessage()); @@ -189,7 +189,7 @@ public class DaHuaUtil { param.put("userId", userId);//商户编号 Map map = generateMap("3c.discount.querysaleplan",param); log.info("jieshunv2 querySalePlan :" + JSON.toJSONString(map)); - return ProcBussiness(QUERY_PLAN, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); + return ProcBussiness(QUERY_PLAN, vp.getString("cid"), map, token); } /** @@ -204,7 +204,7 @@ public class DaHuaUtil { param.put("carOrCardNo", handleCarNumber(carNumber));//优惠券编号 Map map = generateMap("3c.discount.executediscount",param); log.info("jieshunv2 executediscount :" + JSON.toJSONString(map)); - return ProcBussiness(PLAN_EXECUTE, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); + return ProcBussiness(PLAN_EXECUTE, vp.getString("cid"), map, token); } /*token认证登陆**/ @@ -231,29 +231,27 @@ public class DaHuaUtil { param.put("isCallBack", 0);//优惠券编号 Map map = generateMap("3c.pay.notifyorderresult",param); log.info("jieshunv2 notifyOrderResult :" + JSON.toJSONString(map)); - return ProcBussiness(PLAN_EXECUTE, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); + return ProcBussiness(PLAN_EXECUTE, vp.getString("cid"), map, token); } private static String ProcBussiness(String url,String cid,Map param,String token) { try { - MessageDigest md5Tool = MessageDigest.getInstance("MD5"); - String p = JSON.toJSONString(param); - byte[] md5Data = md5Tool.digest((p+signKey).getBytes("UTF-8")); - String sn = toHexString(md5Data); - if (url.contains("?")) { - url = url + "&"; - }else { - url = url + "?"; - } - - url = url+"cid="+cid+"&tn="+token+"&sn="+sn+"&v="+version+"&p="+URLEncoder.encode(p, "UTF-8"); +// MessageDigest md5Tool = MessageDigest.getInstance("MD5"); +// String p = JSON.toJSONString(param); +// byte[] md5Data = md5Tool.digest((p+signKey).getBytes("UTF-8")); +// String sn = toHexString(md5Data); +// if (url.contains("?")) { +// url = url + "&"; +// }else { +// url = url + "?"; +// } // - return Proc(url,null); - } catch (NoSuchAlgorithmException e) { - log.error("jieshunv2 request error.",e); - } catch (UnsupportedEncodingException e) { - log.error("jieshunv2 request error.",e); - } +// url = url+"cid="+cid+"&tn="+token+"&sn="+sn+"&v="+version+"&p="+URLEncoder.encode(p, "UTF-8"); +// + return Proc(url,content_type_request,param,token); + } catch (Exception e) { + log.error("dahua request error.",e); + } return null; }