| @@ -53,18 +53,18 @@ public class JieShunUtilV2 { | |||
| public static final int CYF_ERR = 0; | |||
| public static final String TOKEN_URL = "http://www.jslife.com.cn/jsaims/login"; | |||
| public static final String TOKEN_URL = "/jsaims/login"; | |||
| public static final String CREATE_ORDER = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String CREATE_ORDER = "/jsaims/as"; | |||
| public static final String QUERY_ORDER = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String QUERY_ORDER = "/jsaims/as"; | |||
| public static final String GET_COUPON = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String COUPON_USE = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String GET_COUPON = "/jsaims/as"; | |||
| public static final String COUPON_USE = "/jsaims/as"; | |||
| public static final String VERIFY_USER = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String QUERY_PLAN = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String PLAN_EXECUTE = "http://www.jslife.com.cn/jsaims/as"; | |||
| public static final String VERIFY_USER = "/jsaims/as"; | |||
| public static final String QUERY_PLAN = "/jsaims/as"; | |||
| public static final String PLAN_EXECUTE = "/jsaims/as"; | |||
| /** | |||
| * @description UTC时间转化为本地时间 | |||
| @@ -93,11 +93,12 @@ public class JieShunUtilV2 { | |||
| String cid = vp.getString("cid"); | |||
| String userName = vp.getString("usr"); | |||
| String password = vp.getString("psw"); | |||
| return getToken(cid,userName,password); | |||
| String domain = vp.getString("api"); | |||
| return getToken(domain,cid,userName,password); | |||
| } | |||
| private String getToken(String cid,String userName,String password) { | |||
| String result = ProcLogin(cid, userName,password); | |||
| private String getToken(String domain,String cid,String userName,String password) { | |||
| String result = ProcLogin(domain,cid, userName,password); | |||
| log.info("jieshunv2 token cid:"+cid+" userName:"+userName+" password:"+password+" result: "+result); | |||
| if (StringUtils.isBlank(result)) { | |||
| return null; | |||
| @@ -141,7 +142,8 @@ public class JieShunUtilV2 { | |||
| 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")); | |||
| String domain = vp.getString("api"); | |||
| return ProcBussiness(domain+CREATE_ORDER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||
| } | |||
| /** | |||
| @@ -154,7 +156,8 @@ public class JieShunUtilV2 { | |||
| 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")); | |||
| String domain = vp.getString("api"); | |||
| return ProcBussiness(domain+QUERY_ORDER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||
| } | |||
| /** | |||
| @@ -173,7 +176,8 @@ public class JieShunUtilV2 { | |||
| 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")); | |||
| String domain = vp.getString("api"); | |||
| return ProcBussiness(domain+VERIFY_USER, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||
| } 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()); | |||
| @@ -193,7 +197,8 @@ public class JieShunUtilV2 { | |||
| 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")); | |||
| String domain = vp.getString("api"); | |||
| return ProcBussiness(domain+QUERY_PLAN, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||
| } | |||
| /** | |||
| @@ -208,12 +213,13 @@ public class JieShunUtilV2 { | |||
| 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")); | |||
| String domain = vp.getString("api"); | |||
| return ProcBussiness(domain+PLAN_EXECUTE, vp.getString("cid"), map, token,vp.getString("version"),vp.getString("signkey")); | |||
| } | |||
| /*token认证登陆**/ | |||
| private static String ProcLogin(String cid,String user,String password) { | |||
| String url = TOKEN_URL +"?cid="+cid+"&usr="+user+"&psw="+password; | |||
| private static String ProcLogin(String domain,String cid,String user,String password) { | |||
| String url = domain+TOKEN_URL +"?cid="+cid+"&usr="+user+"&psw="+password; | |||
| // ArrayList<NameValuePair> list = new ArrayList<NameValuePair>(); | |||
| // list.add(new BasicNameValuePair("cid", cid)); | |||
| // list.add(new BasicNameValuePair("usr", user)); | |||
| @@ -239,7 +245,8 @@ public class JieShunUtilV2 { | |||
| 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")); | |||
| String domain = vp.getString("api"); | |||
| return ProcBussiness(domain+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) { | |||