| @@ -149,7 +149,7 @@ public class JieShunUtilV2 { | |||||
| param.put("carNo", handleCarNumber(cardNumber)); | param.put("carNo", handleCarNumber(cardNumber)); | ||||
| Map map = generateMap("3c.pay.createorderbycarno",param); | Map map = generateMap("3c.pay.createorderbycarno",param); | ||||
| log.info("jieshunv2 create order :" + JSON.toJSONString(map)); | log.info("jieshunv2 create order :" + JSON.toJSONString(map)); | ||||
| return ProcBussiness(CREATE_ORDER, wxPark.getParkId(), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| return ProcBussiness(CREATE_ORDER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -162,7 +162,7 @@ public class JieShunUtilV2 { | |||||
| param.put("orderNo", orderNo);//商户编号 | param.put("orderNo", orderNo);//商户编号 | ||||
| Map map = generateMap("3c.pay.queryorder",param); | Map map = generateMap("3c.pay.queryorder",param); | ||||
| log.info("jieshunv2 getCarStopFee :" + JSON.toJSONString(map)); | log.info("jieshunv2 getCarStopFee :" + JSON.toJSONString(map)); | ||||
| return ProcBussiness(QUERY_ORDER, wxPark.getParkId(), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| return ProcBussiness(QUERY_ORDER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -181,7 +181,7 @@ public class JieShunUtilV2 { | |||||
| param.put("password", sn.toLowerCase());//优惠券编号 | param.put("password", sn.toLowerCase());//优惠券编号 | ||||
| Map map = generateMap("3c.discount.verifyuser",param); | Map map = generateMap("3c.discount.verifyuser",param); | ||||
| log.info("jieshunv2 verifyuser :" + JSON.toJSONString(map)); | log.info("jieshunv2 verifyuser :" + JSON.toJSONString(map)); | ||||
| return ProcBussiness(VERIFY_USER, wxPark.getParkId(), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| return ProcBussiness(VERIFY_USER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| } catch (NoSuchAlgorithmException e) { | } catch (NoSuchAlgorithmException e) { | ||||
| log.error("jieshunv2 verifyuser error.park:"+wxPark.getId(),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()); | throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"jieshunv2 verifyuser error.park:"+wxPark.getId()+".error"+e.getMessage()); | ||||
| @@ -201,7 +201,7 @@ public class JieShunUtilV2 { | |||||
| param.put("userId", userId);//商户编号 | param.put("userId", userId);//商户编号 | ||||
| Map map = generateMap("3c.discount.querysaleplan",param); | Map map = generateMap("3c.discount.querysaleplan",param); | ||||
| log.info("jieshunv2 querySalePlan :" + JSON.toJSONString(map)); | log.info("jieshunv2 querySalePlan :" + JSON.toJSONString(map)); | ||||
| return ProcBussiness(QUERY_PLAN, wxPark.getParkId(), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| return ProcBussiness(QUERY_PLAN, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -216,7 +216,7 @@ public class JieShunUtilV2 { | |||||
| param.put("carOrCardNo", handleCarNumber(carNumber));//优惠券编号 | param.put("carOrCardNo", handleCarNumber(carNumber));//优惠券编号 | ||||
| Map map = generateMap("3c.discount.executediscount",param); | Map map = generateMap("3c.discount.executediscount",param); | ||||
| log.info("jieshunv2 executediscount :" + JSON.toJSONString(map)); | log.info("jieshunv2 executediscount :" + JSON.toJSONString(map)); | ||||
| return ProcBussiness(PLAN_EXECUTE, wxPark.getParkId(), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| return ProcBussiness(PLAN_EXECUTE, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| } | } | ||||
| /*token认证登陆**/ | /*token认证登陆**/ | ||||
| @@ -247,7 +247,7 @@ public class JieShunUtilV2 { | |||||
| param.put("isCallBack", 0);//优惠券编号 | param.put("isCallBack", 0);//优惠券编号 | ||||
| Map map = generateMap("3c.pay.notifyorderresult",param); | Map map = generateMap("3c.pay.notifyorderresult",param); | ||||
| log.info("jieshunv2 notifyOrderResult :" + JSON.toJSONString(map)); | log.info("jieshunv2 notifyOrderResult :" + JSON.toJSONString(map)); | ||||
| return ProcBussiness(PLAN_EXECUTE, wxPark.getParkId(), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| return ProcBussiness(PLAN_EXECUTE, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||||
| } | } | ||||
| private static String ProcBussiness(String url,String cid,Map<String,Object> param,String token,String version,String signKey) { | private static String ProcBussiness(String url,String cid,Map<String,Object> param,String token,String version,String signKey) { | ||||