|
@@ -144,9 +144,10 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
|
|
|
Set<Long> userIds = new HashSet<>(1);
|
|
|
Set<Long> backPolicyIds = new HashSet<>();
|
|
|
agentList.forEach(agent -> {
|
|
|
+ AccountTypeEnum accountType = AccountTypeEnum.getByValue(agent.getAccountType());
|
|
|
gameIds.add(agent.getGameId());
|
|
|
- if (AccountTypeEnum.TENCENT_H5.getValue().equals(agent.getAccountType())
|
|
|
- || AccountTypeEnum.TENCENT_MINI_GAME.getValue().equals(agent.getAccountType())) {
|
|
|
+ if (AccountTypeEnum.TENCENT_H5 == accountType
|
|
|
+ || AccountTypeEnum.TENCENT_MINI_GAME == accountType) {
|
|
|
txAccountIds.add(agent.getAccountId());
|
|
|
}
|
|
|
userIds.add(agent.getCreateBy());
|
|
@@ -184,6 +185,17 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
|
|
|
}).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
+ private AgentVO toVOSimple(Agent agent) {
|
|
|
+ AccountTypeEnum accountType = AccountTypeEnum.getByValue(agent.getAccountType());
|
|
|
+ AgentVO vo = BeanUtil.copy(agent, AgentVO.class);
|
|
|
+ if (accountType == AccountTypeEnum.BYTE) {
|
|
|
+ vo.setAgentKey("?agentKey=" + agent.getAgentKey());
|
|
|
+ } else if (accountType == AccountTypeEnum.TENCENT_H5 || accountType == AccountTypeEnum.TENCENT_MINI_GAME) {
|
|
|
+ vo.setAgentKey("?state=" + agent.getAgentKey());
|
|
|
+ }
|
|
|
+ return vo;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public List<AgentDTO> listUserAgent(String account, String pitcherId, Long agentId) {
|
|
|
List<Agent> agentList;
|