diff --git a/src/main/java/com/jmfy/controller/CHGnRechargeController.java b/src/main/java/com/jmfy/controller/CHGnRechargeController.java index 4aaf52e..f9dbe22 100644 --- a/src/main/java/com/jmfy/controller/CHGnRechargeController.java +++ b/src/main/java/com/jmfy/controller/CHGnRechargeController.java @@ -109,14 +109,24 @@ public class CHGnRechargeController { private String insertOrder(CHRechargeBean data) { try { //String user_id = data.getUserid(); - String user_id = data.getExtra(); - //String consumerName = data.getExtra(); + // 角色id_物品id_cc值 + String callbackInfo = data.getExtra(); + String[] callback = callbackInfo.split("_"); + String uid,goodid,cc_id; + if (callback.length >= 3){ + uid = callback[0]; + goodid = callback[1]; + cc_id = callback[2]; + }else { + uid = callback[0]; + goodid = callback[1]; + cc_id = ""; + } + String orderNo = data.getOrderno_cp(); int amount = data.getPay_amt(); - String uid = user_id.split("_")[0]; - String goodid = user_id.split("_")[1]; CUserInfo cUserInfo = cuserDao.findUserInfo(Integer.valueOf(uid)); if (cUserInfo == null) { LOGGER.info("该用户无此角色" + uid); @@ -138,6 +148,7 @@ public class CHGnRechargeController { cPayOrder.setUserId(uid); cPayOrder.setAmount(String.valueOf(amount)); cPayOrder.setGoodsId(goodid); + cPayOrder.setCc_id(cc_id); // cPayOrder.setRecharge_type(); Result result = null; diff --git a/src/main/java/com/jmfy/controller/XPRechargeController.java b/src/main/java/com/jmfy/controller/XPRechargeController.java index 06046e5..61c0fc7 100644 --- a/src/main/java/com/jmfy/controller/XPRechargeController.java +++ b/src/main/java/com/jmfy/controller/XPRechargeController.java @@ -96,8 +96,17 @@ public class XPRechargeController { private String insertOrder(XPParamBean data) { try { - - String consumerName = data.getCallbackInfo(); + // 角色id_物品id_cc值 + String callbackInfo = data.getCallbackInfo(); + String consumerName,cc_id; + String[] callback = callbackInfo.split("_"); + if (callback.length >= 3){ + consumerName = callback[1]; + cc_id = callback[2]; + }else { + consumerName = callbackInfo; + cc_id = ""; + } String orderNo = data.getOrderId(); String amount = data.getAmount(); @@ -123,6 +132,7 @@ public class XPRechargeController { cPayOrder.setUserId(uid); cPayOrder.setAmount(amount); cPayOrder.setGoodsId(consumerName); + cPayOrder.setCc_id(cc_id); // cPayOrder.setRecharge_type(); Result result = null;