From 7a89ca7c19763ce8d7ad7abbb78e5d55a7defb4c Mon Sep 17 00:00:00 2001 From: tonglin <97326827@qq.com> Date: Tue, 3 Jan 2023 14:06:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AE=A9bot?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gitlink/softbot/service/user/impl/UserService.java | 6 +++++- .../com/gitlink/softbot/vo/GetTransferToBotResponse.java | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java index 0f0a624..d60bca0 100644 --- a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java +++ b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java @@ -20,6 +20,7 @@ import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; @Service @@ -674,6 +675,9 @@ public class UserService extends AbstractUserBot implements IUserService { List transferBots = transferBotMapper.selectList(new QueryWrapper() .eq("is_success",getTransferToBotRequest.getState()) .eq("transfer_to_id",getTransferToBotRequest.getUserId())); + Map transferBotMap = transferBots. + stream(). + collect(Collectors.toMap(TransferBot::getBotId,transferBot -> transferBot)); List botList = new ArrayList<>(); if (!Objects.isNull(transferBots)){ transferBots.forEach(transferBot -> { @@ -689,7 +693,7 @@ public class UserService extends AbstractUserBot implements IUserService { if (!Objects.isNull(botList)){ botList.forEach(bot -> { log.info("bot==:{}",bot); - getTransferToBots.add(getTransferToBotResponse.getTransferToBot(bot)); + getTransferToBots.add(getTransferToBotResponse.getTransferToBot(bot,transferBotMap.get(bot.getId()))); }); } getTransferToBotResponse.setUserId(getTransferToBotRequest.getUserId()); diff --git a/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java b/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java index c01ae7d..146b8bf 100644 --- a/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java +++ b/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.gitlink.softbot.entity.db.Bot; import com.gitlink.softbot.entity.db.MarketBot; +import com.gitlink.softbot.entity.db.TransferBot; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -26,11 +27,13 @@ import java.util.List; public class GetTransferToBotResponse implements Serializable { private Integer userId; private List botList; - public GetTransferToBot getTransferToBot(Bot bot){ + public GetTransferToBot getTransferToBot(Bot bot, TransferBot transferBot){ log.info("bot:{}",bot); GetTransferToBot getTransferToBot = new GetTransferToBot(); getTransferToBot.setBotId(bot.getId()); getTransferToBot.setBotName(bot.getBotName()); + getTransferToBot.setTransferDate(transferBot.getTransferTime()); + getTransferToBot.setTransferId(transferBot.getTransferFromId()); return getTransferToBot; } @Data @@ -42,5 +45,7 @@ public class GetTransferToBotResponse implements Serializable { public class GetTransferToBot{ private Integer botId; private String botName; + private Integer transferId; + private Date transferDate; } }