From 496da0a54dcd47bea590f3dc797b0d137d1a9eab Mon Sep 17 00:00:00 2001 From: gaojie Date: Tue, 26 Feb 2019 09:54:58 +0800 Subject: [PATCH] fix --- src/main/java/com/jmfy/controller/RechargeController.java | 8 +++++--- src/main/java/com/jmfy/controller/SendMailController.java | 2 +- src/main/java/com/jmfy/controller/UserController.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/jmfy/controller/RechargeController.java b/src/main/java/com/jmfy/controller/RechargeController.java index 3548bd8..0b33cdc 100644 --- a/src/main/java/com/jmfy/controller/RechargeController.java +++ b/src/main/java/com/jmfy/controller/RechargeController.java @@ -55,7 +55,8 @@ public class RechargeController { ResultVo resultVo = new ResultVo("1038", "该用户无此角色"); return JsonUtil.getInstence().getGson().toJson(resultVo); } - String payitem = "1002#"+activityExtra + stone +"#1"; + int itemNum = Integer.parseInt(activityExtra)+Integer.parseInt(stone); + String payitem = "1002#"+ itemNum+"#1"; CPayOrder cPayOrder = cuserDao.getCpayOrderByOrderId(pOrderId); ResultVo resultVo; if (cPayOrder != null) { @@ -65,6 +66,7 @@ public class RechargeController { String date = dateTimeformat.format(new Date()); cPayOrder = new CPayOrder(); cPayOrder.setOrderId(pOrderId); + cPayOrder.setServerId(serverCode); cPayOrder.setDelivery_time(date); cPayOrder.setUserId(userId); cPayOrder.setCpOrderId(remark); @@ -75,7 +77,7 @@ public class RechargeController { cPayOrder.setCreditId(creditId); Result result = null; String userAddress = cuserDao.findUserInfo(Integer.parseInt(serverCode), Integer.parseInt(creditId)); - LOGGER.info("userAddress : " + userAddress); + LOGGER.info("userAddress={},payitem={} ",userAddress,payitem); if (userAddress != null) { String[] split = userAddress.split(":"); String ip = split[0]; @@ -102,7 +104,7 @@ public class RechargeController { return JsonUtil.getInstence().getGson().toJson(resultVo); } public static void main (String [] args){ - String s = MD5Util.encrypByMd5("test12345678909"+10212+10005616+"cs1147"+0.99+60+1550828074000L+YsjConstant.TW_GameKey); + String s = MD5Util.encrypByMd5("test2234567892"+10212+10005697+111111+0.99+60+1550828074000L+YsjConstant.TW_GameKey); System.out.println(s); } } diff --git a/src/main/java/com/jmfy/controller/SendMailController.java b/src/main/java/com/jmfy/controller/SendMailController.java index ec9c74a..f346a18 100644 --- a/src/main/java/com/jmfy/controller/SendMailController.java +++ b/src/main/java/com/jmfy/controller/SendMailController.java @@ -89,7 +89,7 @@ public class SendMailController { } public static void main (String [] args){ - String s = MD5Util.encrypByMd5("cs1147"+10005616+10212+"TWDK"+"skdfjskfdjslakdfjals"+"1,1001,100;1,1002,1000"+YsjConstant.TW_GameKey); + String s = MD5Util.encrypByMd5(111111+10005697+10212+"TWDK"+"skdfjskfdjslakdfjals"+"1,1001,100;1,1002,1000"+YsjConstant.TW_GameKey); System.out.println(s); } } diff --git a/src/main/java/com/jmfy/controller/UserController.java b/src/main/java/com/jmfy/controller/UserController.java index 764cd8f..9a8436d 100644 --- a/src/main/java/com/jmfy/controller/UserController.java +++ b/src/main/java/com/jmfy/controller/UserController.java @@ -49,7 +49,7 @@ public class UserController { } public static void main (String [] args){ - String s = MD5Util.encrypByMd5(YsjConstant.TW_GameKey + "cs1147" + 10212); + String s = MD5Util.encrypByMd5(YsjConstant.TW_GameKey + "111111" + 10212); System.out.println(s); } }