generated from root/miduo_server
fix
parent
5c26dc3c10
commit
496da0a54d
|
@ -55,7 +55,8 @@ public class RechargeController {
|
||||||
ResultVo resultVo = new ResultVo("1038", "该用户无此角色");
|
ResultVo resultVo = new ResultVo("1038", "该用户无此角色");
|
||||||
return JsonUtil.getInstence().getGson().toJson(resultVo);
|
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);
|
CPayOrder cPayOrder = cuserDao.getCpayOrderByOrderId(pOrderId);
|
||||||
ResultVo resultVo;
|
ResultVo resultVo;
|
||||||
if (cPayOrder != null) {
|
if (cPayOrder != null) {
|
||||||
|
@ -65,6 +66,7 @@ public class RechargeController {
|
||||||
String date = dateTimeformat.format(new Date());
|
String date = dateTimeformat.format(new Date());
|
||||||
cPayOrder = new CPayOrder();
|
cPayOrder = new CPayOrder();
|
||||||
cPayOrder.setOrderId(pOrderId);
|
cPayOrder.setOrderId(pOrderId);
|
||||||
|
cPayOrder.setServerId(serverCode);
|
||||||
cPayOrder.setDelivery_time(date);
|
cPayOrder.setDelivery_time(date);
|
||||||
cPayOrder.setUserId(userId);
|
cPayOrder.setUserId(userId);
|
||||||
cPayOrder.setCpOrderId(remark);
|
cPayOrder.setCpOrderId(remark);
|
||||||
|
@ -75,7 +77,7 @@ public class RechargeController {
|
||||||
cPayOrder.setCreditId(creditId);
|
cPayOrder.setCreditId(creditId);
|
||||||
Result result = null;
|
Result result = null;
|
||||||
String userAddress = cuserDao.findUserInfo(Integer.parseInt(serverCode), Integer.parseInt(creditId));
|
String userAddress = cuserDao.findUserInfo(Integer.parseInt(serverCode), Integer.parseInt(creditId));
|
||||||
LOGGER.info("userAddress : " + userAddress);
|
LOGGER.info("userAddress={},payitem={} ",userAddress,payitem);
|
||||||
if (userAddress != null) {
|
if (userAddress != null) {
|
||||||
String[] split = userAddress.split(":");
|
String[] split = userAddress.split(":");
|
||||||
String ip = split[0];
|
String ip = split[0];
|
||||||
|
@ -102,7 +104,7 @@ public class RechargeController {
|
||||||
return JsonUtil.getInstence().getGson().toJson(resultVo);
|
return JsonUtil.getInstence().getGson().toJson(resultVo);
|
||||||
}
|
}
|
||||||
public static void main (String [] args){
|
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);
|
System.out.println(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,7 +89,7 @@ public class SendMailController {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main (String [] args){
|
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);
|
System.out.println(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class UserController {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main (String [] args){
|
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);
|
System.out.println(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue