diff --git a/src/main/java/com/jmfy/controller/MHTHwRechargeController.java b/src/main/java/com/jmfy/controller/MHTHwRechargeController.java index 8ae6032..eb5b3f1 100644 --- a/src/main/java/com/jmfy/controller/MHTHwRechargeController.java +++ b/src/main/java/com/jmfy/controller/MHTHwRechargeController.java @@ -45,26 +45,26 @@ public class MHTHwRechargeController { @RequestMapping(value = "/MHTHwcallback") public String MHTcallback(HttpServletRequest request) throws Exception { - return process(request,"6d415f7ae72649b5b9a248677b080034"); + return process(request,"gp_online","6d415f7ae72649b5b9a248677b080034"); } @RequestMapping(value = "/MHTHwIosCallback") public String MHTHwIosCallback(HttpServletRequest request) throws Exception { - return process(request,"c130d086f10a275de2440f6e2a28912a"); + return process(request,"ios_online","c130d086f10a275de2440f6e2a28912a"); } @RequestMapping(value = "/MHTHwTestCallback") public String MHTHwIestCallback(HttpServletRequest request) throws Exception { - return process(request,"02738d4f8aad8f4860c3916be35dc89b"); + return process(request,"gp_test","02738d4f8aad8f4860c3916be35dc89b"); } @RequestMapping(value = "/MHTHwIosTestCallback") public String MHTHwIosTestCallback(HttpServletRequest request) throws Exception { - return process(request,"5f620985bd0be3d5e5fe66a289aaadc1"); + return process(request,"ios_test","5f620985bd0be3d5e5fe66a289aaadc1"); } - private String process(HttpServletRequest request,String appsecret) throws Exception{ + private String process(HttpServletRequest request,String rechargeType,String appsecret) throws Exception{ HashMap parameterMap = JsonUtil.getInstence().getParameterMap2(request); if (parameterMap.isEmpty()) { LOGGER.info("data is null"); @@ -91,7 +91,7 @@ public class MHTHwRechargeController { return "sign fail"; } - response = insertOrder(data); + response = insertOrder(data,rechargeType); } catch (Exception e) { e.printStackTrace(); @@ -109,7 +109,7 @@ public class MHTHwRechargeController { } - private String insertOrder(MHTRechargeRequestBean.DataBean data) { + private String insertOrder(MHTRechargeRequestBean.DataBean data,String rechargeType) { try { String consumerid = data.getConsumerId(); String consumerName = data.getConsumerName(); @@ -136,6 +136,7 @@ public class MHTHwRechargeController { cPayOrder.setUserId(consumerid); cPayOrder.setAmount(data.getMhtOrderAmt()); cPayOrder.setGoodsId(consumerName); + cPayOrder.setRecharge_type(rechargeType); Result result = null; String userAddress = cuserDao.findUserAddress(cUserInfo.getId()); if (userAddress != null) {