Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
ad00a842af
|
@ -232,14 +232,13 @@ public class BuyGoodsNewLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyPaySuccessFul(uid,goodsId,amount != -999);
|
notifyPaySuccessFul(uid,goodsId,amount != -999);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.RECHARGE_BUY.getType(),goodsId));
|
|
||||||
MongoUtil.getLjsdMongoTemplate().lastUpdate();
|
MongoUtil.getLjsdMongoTemplate().lastUpdate();
|
||||||
sendGiftGoodsWithoutJudge(uid);
|
sendGiftGoodsWithoutJudge(uid);
|
||||||
Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(dropByBag);
|
|
||||||
if(price>0){
|
// 扶持订单不需要上报
|
||||||
|
if(price>0 && !orderId.equals("support-order")){
|
||||||
|
// 以下为充值上报
|
||||||
|
Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(dropByBag);
|
||||||
MessageUtil.sendIndicationMessage(session,1,
|
MessageUtil.sendIndicationMessage(session,1,
|
||||||
MessageTypeProto.MessageType.RECHARGE_SUCCESS_INDICATION_VALUE,
|
MessageTypeProto.MessageType.RECHARGE_SUCCESS_INDICATION_VALUE,
|
||||||
PlayerInfoProto.RechargeSuccessIndication.newBuilder().setOrderId(orderId).build(),true);
|
PlayerInfoProto.RechargeSuccessIndication.newBuilder().setOrderId(orderId).build(),true);
|
||||||
|
@ -249,8 +248,9 @@ public class BuyGoodsNewLogic {
|
||||||
new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date(),
|
new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date(),
|
||||||
user.getPlayerInfoManager().getLastDeviceId()==null?
|
user.getPlayerInfoManager().getLastDeviceId()==null?
|
||||||
"DEFAULT_DEVICE":user.getPlayerInfoManager().getLastDeviceId());
|
"DEFAULT_DEVICE":user.getPlayerInfoManager().getLastDeviceId());
|
||||||
|
onChargeSuccess(user,price,0,orderId,cfgType);//充值成功上报
|
||||||
}
|
}
|
||||||
onChargeSuccess(user,price,0,orderId,cfgType);//充值成功上报
|
|
||||||
return resultRes;
|
return resultRes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue