连续礼包,礼包id重复问题处理
parent
d69aca969f
commit
c555ca977f
|
@ -56,7 +56,7 @@ public class BuyGoodsToItemHandler extends BaseHandler<ActivityProto.BuyGoodsToI
|
|||
// 领取奖励
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, goodsConfig.getGoods(), goodsNum, BIReason.BUY_GOOD_ITEM_GET);
|
||||
// 消息发送
|
||||
Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),goodId,goodsNum));
|
||||
Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),goodId,goodsNum,2));
|
||||
// 返回
|
||||
ActivityProto.BuyGoodsToItemResponse build = ActivityProto.BuyGoodsToItemResponse.newBuilder().setDrop(drop).build();
|
||||
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.BuyGoodsToItemResponse_VALUE,build,true);
|
||||
|
|
|
@ -61,7 +61,7 @@ public class ContinuousGiftActivity extends AbstractActivity {
|
|||
SuperBoxEvent event1 = (SuperBoxEvent) event;
|
||||
User user = UserManager.getUser(event1.getUserId());
|
||||
// 礼包处理
|
||||
giftHandle(user, event1.getGiftId(), event1.getNum());
|
||||
giftHandle(user, event1.getGiftId(), event1.getNum(), event1.getType());
|
||||
|
||||
// 客户端推送
|
||||
ISession session = OnlineUserManager.getSessionByUid(user.getId());
|
||||
|
@ -74,12 +74,11 @@ public class ContinuousGiftActivity extends AbstractActivity {
|
|||
* @param giftId
|
||||
* @param missionMap
|
||||
*/
|
||||
private void giftHandle(User user, int giftId, int giftNum){
|
||||
private void giftHandle(User user, int giftId, int giftNum, int type){
|
||||
if (giftId < 0 || giftNum <= 0){
|
||||
// 非礼包处理
|
||||
return;
|
||||
}
|
||||
|
||||
ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id);
|
||||
if (mission == null){
|
||||
return;
|
||||
|
@ -88,7 +87,7 @@ public class ContinuousGiftActivity extends AbstractActivity {
|
|||
Collection<SThemeActivityShop> themeShops = SThemeActivityShop.themeMap.getOrDefault(id, new HashMap<>(0)).values();
|
||||
|
||||
for (SThemeActivityShop theme : themeShops) {
|
||||
if (theme.getGoodId() == giftId){
|
||||
if (theme.getGoodId() == giftId && theme.getGoodType() == type){
|
||||
// 记录礼包购买次数
|
||||
ActivityProgressInfo current = missionMap.getOrDefault(theme.getId(),new ActivityProgressInfo());
|
||||
current.setProgrss(current.getProgrss() + giftNum);
|
||||
|
|
|
@ -236,7 +236,7 @@ public class BuyGoodsNewLogic {
|
|||
sendGiftGoodsWithoutJudge(uid);
|
||||
openPush(session,user, PushRechargeType.point_recharge.getType(),goodsId,1);
|
||||
// 惊喜礼盒,事件推送
|
||||
Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),config.getId()));
|
||||
Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),config.getId(),1,1));
|
||||
// 更新入库
|
||||
MongoUtil.getLjsdMongoTemplate().lastUpdate();
|
||||
// 扶持订单不需要上报
|
||||
|
|
Loading…
Reference in New Issue