发货机日志

master
gaojie 2019-05-16 17:33:46 +08:00
parent d0d61c8c88
commit 4bf512fbfe
4 changed files with 24 additions and 14 deletions

View File

@ -18,7 +18,7 @@ public class GetOrderController {
private CUserDao cuserDao;
private static final Logger LOGGER = LoggerFactory.getLogger(GetOrderController.class);
@RequestMapping(value = "/getorder")
public String deliveryGoods(HttpServletRequest request) {
public String getorder(HttpServletRequest request) {
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
String date = parameterMap.get("date");
String agoDate = JsonUtil.getSpecifiedDayBefore(date);

View File

@ -25,7 +25,7 @@ public class RechargeController {
private CUserDao cuserDao;
private static final Logger LOGGER = LoggerFactory.getLogger(RechargeController.class);
@RequestMapping(value = "/callback")
public String deliveryGoods(HttpServletRequest request) throws Exception {
public String callback(HttpServletRequest request) throws Exception {
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
String pOrderId = parameterMap.get("pOrderId");
String userId = parameterMap.get("userId");
@ -46,6 +46,7 @@ public class RechargeController {
String payType = parameterMap.get("payType");
String sig = MD5Util.encrypByMd5(pOrderId+serverCode+creditId+userId+amount+stone+time+YsjConstant.TW_GameKey);
if (!sig.equals(sign)){
LOGGER.info("callback==>creditId={},sin derify fail ",creditId);
FindPlayerResult findPlayerResult = new FindPlayerResult("1010","sign derify failed",null);
return JsonUtil.getInstence().getGson().toJson(findPlayerResult);
}
@ -55,7 +56,7 @@ public class RechargeController {
}
CUserInfo cUserInfo = cuserDao.getUserInfobyNameAndServerId(userId, Integer.parseInt(serverCode),plat);
if (Integer.parseInt(creditId) != cUserInfo.getUserId()){
LOGGER.info("deliveryGoods==>creditId={},uId={}",creditId,cUserInfo.getUserId());
LOGGER.info("callback==>creditId={},uId={}",creditId,cUserInfo.getUserId());
ResultVo resultVo = new ResultVo("1038", "该用户无此角色");
return JsonUtil.getInstence().getGson().toJson(resultVo);
}
@ -67,7 +68,7 @@ public class RechargeController {
CPayOrder cPayOrder = cuserDao.getCpayOrderByOrderId(pOrderId);
ResultVo resultVo;
if (cPayOrder != null) {
LOGGER.info("deliveryGoods==>creditId={},uId={} pOrderId is exit!!!",creditId,cUserInfo.getUserId());
LOGGER.info("callback==>creditId={},uId={} pOrderId is exit!!!",creditId,cUserInfo.getUserId());
resultVo = new ResultVo("0000", "send reward success !!!!");
} else {
DateFormat dateTimeformat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@ -85,7 +86,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("callback==>userAddress={} ",userAddress);
if (userAddress != null) {
String[] split = userAddress.split(":");
String ip = split[0];
@ -101,8 +102,8 @@ public class RechargeController {
e.printStackTrace();
}
}
LOGGER.info("RPC result : ResultCode : " + result.getResultCode() + "; ResultMsg : " + result.getResultMsg());
if (result.getResultCode() == 0) {
if (result != null && result.getResultCode() == 0) {
LOGGER.info(" callback==>RPC result : ResultCode : " + result.getResultCode() + "; ResultMsg : " + result.getResultMsg());
cuserDao.addCpayOrder(cPayOrder);
resultVo = new ResultVo("0000", "send reward success !!!!");
} else {

View File

@ -2,6 +2,7 @@ package com.jmfy.controller;
import com.jmfy.dto.*;
import com.jmfy.thrift.idl.RPCRequestIFace;
import com.jmfy.thrift.idl.Result;
import com.jmfy.thrift.pool.ClientAdapterPo;
import com.jmfy.thrift.pool.ServiceKey;
import com.jmfy.util.JsonUtil;
@ -23,7 +24,7 @@ public class SendMailController {
private CUserDao cuserDao;
private static final Logger LOGGER = LoggerFactory.getLogger(SendMailController.class);
@RequestMapping(value = "/efun_reward")
public String deliveryGoods(HttpServletRequest request) throws Exception {
public String efun_reward(HttpServletRequest request) throws Exception {
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
String userId = parameterMap.get("userId");
String roleId = parameterMap.get("roleId");
@ -38,12 +39,14 @@ public class SendMailController {
//验证sign
String sig = MD5Util.encrypByMd5(userId+roleId+serverCode+gameCode+serialNo+packageId+YsjConstant.TW_GameKey);
if (!sig.equals(sign)){
LOGGER.info("efun_reward==>userId={},sin derify fail ",userId);
ResultVo resultVo = new ResultVo("1010", "sign derify failed");
return JsonUtil.getInstence().getGson().toJson(resultVo);
}
boolean isExist =cuserDao.getMailSeriaNo(serialNo);
//发奖流水号 不能重复
if (isExist){
LOGGER.info("efun_reward==>userId={},serialNo is exist ",userId);
ResultVo resultVo = new ResultVo("1006", "serialNo is exist");
return JsonUtil.getInstence().getGson().toJson(resultVo);
}
@ -59,24 +62,30 @@ public class SendMailController {
// String rewardItems = packageId.replaceAll(",","#").replaceAll(";","|");
String rewardItems = getNewRewardItem(packageId);
String userAddress = cuserDao.findUserInfo(Integer.parseInt(serverCode), cUserInfo.getUserId());
LOGGER.info("userAddress={},rewardItems={} ",userAddress,rewardItems);
LOGGER.info("efun_reward ==> userAddress={},rewardItems={} ",userAddress,rewardItems);
Result result = null;
if (userAddress != null){
String[] split = userAddress.split(":");
String ip = split[0];
String port = split[1];
LOGGER.info("RPC address --> IP : "+ ip + "; PORT : "+ port);
LOGGER.info("efun_reward ==>RPC address --> IP : "+ ip + "; PORT : "+ port);
ClientAdapterPo<RPCRequestIFace.Client> rPCClient;
String serviceKey = JsonUtil.getServiceKey(ServiceKey.RPCCore,ip,port);
LOGGER.info("serviceKey : "+ serviceKey);
try {
rPCClient = ClientAdapterPo.getClientAdapterPo(serviceKey);
rPCClient.getClient().sendMail(cUserInfo.getUserId(), rewardItems,URLDecoder.decode(title, "UTF-8"),URLDecoder.decode(content, "UTF-8"));
result = rPCClient.getClient().sendMail(cUserInfo.getUserId(), rewardItems, URLDecoder.decode(title, "UTF-8"), URLDecoder.decode(content, "UTF-8"));
cuserDao.addMailSeriaNo(serialNo);
} catch (Exception e) {
e.printStackTrace();
}
}
ResultVo resultVo = new ResultVo("0000", "success");
ResultVo resultVo;
if (result!= null && result.getResultCode() == 0) {
resultVo = new ResultVo("1000", "send reward success !!!!");
} else {
resultVo = new ResultVo("1002", "send reward fail !!!!");
}
return JsonUtil.getInstence().getGson().toJson(resultVo);
}

View File

@ -22,7 +22,7 @@ public class UserController {
private CUserDao cuserDao;
private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
@RequestMapping(value = "/getRoles")
public String deliveryGoods(HttpServletRequest request) throws Exception {
public String getRoles(HttpServletRequest request) throws Exception {
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
String userId = parameterMap.get("userId");
String serverCode = parameterMap.get("serverCode");
@ -34,7 +34,7 @@ public class UserController {
}
List<CUserInfo> cUserInfoList = cuserDao.getUserInfo(userId, Integer.parseInt(serverCode));
if (null == cUserInfoList || cUserInfoList.size() == 0){
LOGGER.info("UserController=>userName={},serverId={},cUserInfo is null",userId,serverCode);
LOGGER.info("getRoles=>userName={},serverId={},cUserInfo is null",userId,serverCode);
FindPlayerResult findPlayerResult = new FindPlayerResult("1038","no userInfo",null);
return JsonUtil.getInstence().getGson().toJson(findPlayerResult);
}else {