diff --git a/ff-game/src/main/java/com/ff/agent/controller/AgentController.java b/ff-game/src/main/java/com/ff/agent/controller/AgentController.java index a924092..42697ba 100644 --- a/ff-game/src/main/java/com/ff/agent/controller/AgentController.java +++ b/ff-game/src/main/java/com/ff/agent/controller/AgentController.java @@ -53,7 +53,8 @@ public class AgentController extends BaseController { @Resource private ITenantGameQuotaService tenantGameQuotaService; - + @Resource + private ITenantPlatformService tenantPlatformService; /** @@ -74,6 +75,9 @@ public class AgentController extends BaseController { for (TenantSecretKey row : (List) dataTable.getRows()) { AgentTenantSecretKeyDTO agentTenantSecretKeyDTO = new AgentTenantSecretKeyDTO(); BeanUtils.copyProperties(row, agentTenantSecretKeyDTO); + agentTenantSecretKeyDTO.setTenantPlatforms(tenantPlatformService.selectTenantPlatformList(TenantPlatform.builder() + .tenantId(row.getId()) + .build())); list.add(agentTenantSecretKeyDTO); } dataTable.setRows(list); @@ -98,6 +102,7 @@ public class AgentController extends BaseController { TenantPlatform tenantPlatform = new TenantPlatform(); BeanUtils.copyProperties(tenantAgentPlatform, tenantPlatform); tenantPlatforms.add(tenantPlatform); + } diff --git a/ff-game/src/main/java/com/ff/agent/dto/AgentTenantSecretKeyDTO.java b/ff-game/src/main/java/com/ff/agent/dto/AgentTenantSecretKeyDTO.java index aaf5a2d..7612262 100644 --- a/ff-game/src/main/java/com/ff/agent/dto/AgentTenantSecretKeyDTO.java +++ b/ff-game/src/main/java/com/ff/agent/dto/AgentTenantSecretKeyDTO.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.ff.base.annotation.Excel; import com.ff.base.core.domain.BaseEntity; +import com.ff.base.system.domain.TenantPlatform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,6 +13,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.math.BigDecimal; +import java.util.List; /** * 用户租户密钥对象 ff_tenant_secret_key @@ -91,4 +93,10 @@ public class AgentTenantSecretKeyDTO extends BaseEntity private BigDecimal depositRatio; + /** + * 租户代理平台利润 + */ + private List tenantPlatforms; + + }