diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index 92fdef1d2..eb776f9af 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -41,21 +41,18 @@ public class CoreService implements RPCRequestIFace.Iface { @Override public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) { + Result result = new Result(); try { - LOGGER.info("deliveryRecharge start",uid ); - return BuyGoodsNewLogic.sendGoods(uid, goodsId, openId, orderId, orderTime, amount); + LOGGER.info("deliveryRecharge start {}", uid); + result = BuyGoodsNewLogic.sendGoods(uid, goodsId, openId, orderId, orderTime, amount); } catch (Exception e) { - User user = UserManager.getUserNotCache(uid); - Result result = new Result(); + LOGGER.error("user:{},购买礼包抛出异常:{}",uid,e); + User user = UserManager.getUserNotCache(uid); result.setResultCode(0); - if(user == null){ - LOGGER.info("the uid={} not found",uid ); - } result.setResultMsg("server exce"); KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,orderId,result.getResultCode(),amount); - return result; } - + return result; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java index b5fb48e00..42eda0850 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java @@ -46,7 +46,7 @@ public class UseAndPriceItemHandler extends BaseHandler1){ @@ -303,17 +315,10 @@ public class BuyGoodsNewLogic { // 开天上报 KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent, goodsId, orderId, resultRes.getResultCode(), price); } - - notifyPaySuccessFul(uid,goodsId,amount != -999); - sendGiftGoodsWithoutJudge(uid); - openPush(session,user, PushRechargeType.point_recharge.getType(),goodsId,1); - // 惊喜礼盒,事件推送 - Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),config.getId(),1,1)); // 更新入库 MongoUtil.getLjsdMongoTemplate().lastUpdate(); - MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.RECHARGE_SUCCESS_INDICATION_VALUE, - PlayerInfoProto.RechargeSuccessIndication.newBuilder().setOrderId(orderId).build(), true); + MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.RECHARGE_SUCCESS_INDICATION_VALUE, PlayerInfoProto.RechargeSuccessIndication.newBuilder().setOrderId(orderId).build(), true); return resultRes; }