From 3c123481ac635b03e06fa6c362080084175fc39e Mon Sep 17 00:00:00 2001
From: tonglin <97326827@qq.com>
Date: Tue, 3 Jan 2023 10:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9F=A5=E7=9C=8B=E8=BD=AC?=
 =?UTF-8?q?=E8=AE=A9bot=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/user/impl/UserService.java        | 22 +++++++++++++------
 .../softbot/vo/GetTransferToBotResponse.java  |  6 +++++
 2 files changed, 21 insertions(+), 7 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 5a00e31..fa2185f 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
@@ -675,15 +675,23 @@ public class UserService extends AbstractUserBot implements IUserService {
                 .eq("is_success",getTransferToBotRequest.getState())
                 .eq("transfer_to_id",getTransferToBotRequest.getUserId()));
         List<MarketBot> marketBotList = new ArrayList<>();
-        transferBots.forEach(transferBot -> {
-            marketBotList.add(marketBotMapper.selectOne(new QueryWrapper<MarketBot>()
-                    .eq("bot_id",transferBot.getBotId())));
-        });
+        if (!Objects.isNull(transferBots)){
+            transferBots.forEach(transferBot -> {
+                MarketBot marketBot = marketBotMapper.selectOne(new QueryWrapper<MarketBot>()
+                        .eq("bot_id",transferBot.getBotId()));
+                if (!Objects.isNull(marketBot)){
+                    marketBotList.add(marketBot);
+                }
+            });
+        }
         GetTransferToBotResponse getTransferToBotResponse = new GetTransferToBotResponse();
         List<GetTransferToBotResponse.GetTransferToBot> getTransferToBots = new ArrayList<>();
-        marketBotList.forEach(marketBot -> {
-            getTransferToBots.add(getTransferToBotResponse.getTransferToBot(marketBot));
-        });
+       if (!Objects.isNull(marketBotList)){
+           marketBotList.forEach(marketBot -> {
+               log.info("market==:{}",marketBot);
+               getTransferToBots.add(getTransferToBotResponse.getTransferToBot(marketBot));
+           });
+       }
         getTransferToBotResponse.setUserId(getTransferToBotRequest.getUserId());
         getTransferToBotResponse.setBotList(getTransferToBots);
         return getTransferToBotResponse;
diff --git a/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java b/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java
index aef30cc..22a985c 100644
--- a/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java
+++ b/src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java
@@ -8,6 +8,7 @@ import com.gitlink.softbot.entity.db.MarketBot;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -20,10 +21,12 @@ import java.util.List;
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@Slf4j
 public class GetTransferToBotResponse implements Serializable {
     private Integer userId;
     private List<GetTransferToBot> botList;
     public GetTransferToBot getTransferToBot(MarketBot marketBot){
+        log.info("market:{}",marketBot);
         GetTransferToBot getTransferToBot = new GetTransferToBot();
         getTransferToBot.setBotId(marketBot.getBotId());
         getTransferToBot.setBotName(marketBot.getMarketName());
@@ -32,6 +35,9 @@ public class GetTransferToBotResponse implements Serializable {
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
+    @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public class GetTransferToBot{
         private Integer botId;
         private String botName;