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 14:06:55 +08:00
parent 232d310df6
commit 7a89ca7c19
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<TransferBot> transferBots = transferBotMapper.selectList(new QueryWrapper<TransferBot>()
.eq("is_success",getTransferToBotRequest.getState())
.eq("transfer_to_id",getTransferToBotRequest.getUserId()));
Map<Integer,TransferBot> transferBotMap = transferBots.
stream().
collect(Collectors.toMap(TransferBot::getBotId,transferBot -> transferBot));
List<Bot> 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());

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

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