diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/GameMsgMessage.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/GameMsgMessage.java index bfeb1badb..167ba412c 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/GameMsgMessage.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/GameMsgMessage.java @@ -1,8 +1,8 @@ package com.accompany.business.message; +import com.accompany.business.enums.resource.ResourceCodeEnum; import com.accompany.mq.model.BaseMqMessage; import lombok.Data; -import com.accompany.business.enums.resource.ResourceCodeEnum ; import java.util.Date; @@ -19,6 +19,7 @@ public class GameMsgMessage extends BaseMqMessage { private Integer type; private Double coin; + private Double win = 0.0; private ResourceCodeEnum resourceCodeEnum; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/GameService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/GameService.java index 9ca5b5b1b..4f21674ce 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/GameService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/GameService.java @@ -171,6 +171,7 @@ public class GameService { afterPurse = userPurseService.addDiamond(uid, goldNum, BillObjTypeEnum.LEADERCC_GAME_IN, (up) -> billRecordService.insertGeneralBillRecord(uid, param.getOrderId(), BillObjTypeEnum.LEADERCC_GAME_IN, goldNum, up)); gameMsgMessage.setPushScreen(Boolean.TRUE); + gameMsgMessage.setWin(goldNum); } if (param.getType() == Constant.GameGoldType.REDUCT) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/JoyGameService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/JoyGameService.java index bb058a6be..f7f5cd9c0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/JoyGameService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/JoyGameService.java @@ -156,6 +156,7 @@ public class JoyGameService { afterPurse = userPurseService.addDiamond(uid, goldNum, BillObjTypeEnum.JOY_GAME_IN, (up) -> billRecordService.insertGeneralBillRecord(uid, orderId, BillObjTypeEnum.JOY_GAME_IN, goldNum, up)); gameMsgMessage.setPushScreen(Boolean.TRUE); + gameMsgMessage.setWin(goldNum); break; case Constant.GameGoldType.REDUCT: // 扣减用户钻石 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/MiniGameForBaiShunServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/MiniGameForBaiShunServiceImpl.java index 446f79a30..d33299050 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/MiniGameForBaiShunServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/MiniGameForBaiShunServiceImpl.java @@ -238,6 +238,7 @@ public class MiniGameForBaiShunServiceImpl implements MiniGameForBaiShunService (userPurse -> billRecordService.insertGeneralBillRecord(uid, orderId, BillObjTypeEnum.MINI_GAME_IN, diamondNum, userPurse))); gameMsgMessage.setPushScreen(Boolean.TRUE); gameMsgMessage.setType(Constant.GameGoldType.ADD); + gameMsgMessage.setWin(diamondNum); } else { afterPurse = userPurseService.subDiamond(uid, diamondNum, BillObjTypeEnum.MINI_GAME_OUT, BusiStatus.BAI_SHUN_CURRENCY_NUM_NOT_ENOUGH, (userPurse)-> billRecordService.insertGeneralBillRecord(uid, orderId, BillObjTypeEnum.MINI_GAME_OUT, diamondNum, userPurse)); diff --git a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/GameMsgPushMessageConsumer.java b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/GameMsgPushMessageConsumer.java index 152f65d8f..82fd4a1e8 100644 --- a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/GameMsgPushMessageConsumer.java +++ b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/GameMsgPushMessageConsumer.java @@ -1,15 +1,11 @@ package com.accompany.mq.consumer; import com.accompany.business.constant.dailytask.DailyTaskTypeEnum; -import com.accompany.business.enums.resource.ResourceCodeEnum; import com.accompany.business.event.miniGame.MiniGameChangeCurrencyEvent; -import com.accompany.business.message.BillMessage; import com.accompany.business.message.GameMsgMessage; import com.accompany.business.service.dailytask.DailyTaskService; import com.accompany.business.service.game.BaseGameMessageService; -import com.accompany.business.service.gift.BillMessageService; import com.accompany.business.vo.dailytask.DailyProgressContext; -import com.accompany.common.constant.Constant; import com.accompany.mq.constant.MqConstant; import com.accompany.mq.listener.AbstractMessageListener; import lombok.extern.slf4j.Slf4j; @@ -38,7 +34,7 @@ public class GameMsgPushMessageConsumer extends AbstractMessageListener