Gitlink
/
soft_bot
0
0
Fork 4
Code Issues Pull Requests Projects Releases Wiki Activity

修正查看转让bot空指针问题

This commit is contained in:
tonglin 2023-01-03 10:59:48 +08:00
parent 1ef16a9bc5
commit 3c123481ac
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
View File

@ -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;

6
src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java
View File

@ -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;