feat: agent需求调整提交

yt-agent/agent-service/src/main/java/com/ytpm/controller/PromoterUserController.java

@@ -3,10 +3,10 @@ package com.ytpm.controller;
 
 import com.ytpm.agent.param.PromoterAssignParam;
 import com.ytpm.agent.param.PromoterUserParam;
+import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.middle.param.MiddleUserParam;
-import com.ytpm.middle.view.MiddleUserInfo;
 import com.ytpm.oauth.model.YtPlatformUser;
 import com.ytpm.service.PromoterUserService;
 import io.swagger.annotations.Api;
@@ -37,20 +37,22 @@ public class PromoterUserController {
 
     @ApiOperation("查询渠道所属用户列表")
     @PostMapping("/queryList")
-    public ResultTable<YtPlatformUser> queryList(@RequestBody PromoterUserParam userParam) {
+    public ResultTable<YtPlatformUser> queryList(@RequestBody PromoterUserParam userParam,
+                                                 @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
+        userParam.setParentUserId(userInfo.getUserId());
         return promoterUserService.promoterUserList(userParam);
     }
 
     @ApiOperation("新增渠道所属用户")
     @PostMapping("/addOne")
-    public Result<String> addOne(@RequestBody MiddleUserParam param, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
+    public Result<String> addOne(@RequestBody MiddleUserParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
         param.setOperatorId(userInfo.getUserId());
         return Result.resultObjOk(promoterUserService.addOne(param, userInfo));
     }
 
     @ApiOperation("修改渠道所属用户")
     @PostMapping("/updateOne")
-    public Result<String> updateOne(@RequestBody MiddleUserParam param, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
+    public Result<String> updateOne(@RequestBody MiddleUserParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
         param.setOperatorId(userInfo.getUserId());
         return Result.resultObjOk(promoterUserService.updateOne(param, userInfo));
     }
@@ -65,7 +67,15 @@ public class PromoterUserController {
     @ApiOperation("分配推广人")
     @PostMapping("/assignment")
     public Result<String> assignmentApp(@RequestBody PromoterAssignParam assignParam,
-                                        @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
+                                        @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
         return Result.resultObjOk(promoterUserService.assignmentApp(assignParam, userInfo));
     }
+
+    @ApiOperation("取消分配推广人")
+    @PostMapping("/assignment/delete")
+    public Result<String> unAssignmentApp(@RequestBody PromoterAssignParam assignParam,
+                                          @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
+        return Result.resultObjOk(promoterUserService.unAssignmentApp(assignParam, userInfo));
+    }
+
 }

yt-agent/agent-service/src/main/java/com/ytpm/controller/UserController.java

@@ -1,10 +1,7 @@
 package com.ytpm.controller;
 
-import com.ytpm.agent.enums.UserTypeEnum;
-import com.ytpm.agent.model.YtPlatformUserPromoter;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.dao.AgentUserMapper;
-import com.ytpm.dao.PromoterUserMapper;
 import com.ytpm.general.Result;
 import com.ytpm.oauth.model.YtPlatformUser;
 import io.swagger.annotations.Api;
@@ -16,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Api(tags = "用户管理模块")
 @RestController
@@ -26,19 +22,12 @@ public class UserController {
     @Resource
     private AgentUserMapper agentUserMapper;
 
-    @Resource
-    private PromoterUserMapper promoterUserMapper;
-
     @ApiOperation(value = "获取当前登录用户", notes = "无需传参")
     @GetMapping("/curUser")
     public Result<AgentUserInfo> getCurrentUser(@ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
         YtPlatformUser ytPlatformUser = userInfo == null ? null : agentUserMapper.selectPrimary(userInfo.getUserId());
-        if(userInfo != null && ytPlatformUser != null){
+        if (userInfo != null && ytPlatformUser != null) {
             userInfo.setUserType(ytPlatformUser.getUserType());
-            if(UserTypeEnum.PLATFORM_USER.getCode().equals(userInfo.getUserType())){
-                List<YtPlatformUserPromoter> list = promoterUserMapper.selectPromoterByUserId(userInfo.getUserId());
-                userInfo.setPromoters(list);
-            }
         }
         return Result.resultObjOk(userInfo);
     }

yt-agent/agent-service/src/main/java/com/ytpm/dao/PromoterUserMapper.java

@@ -17,6 +17,11 @@ public interface PromoterUserMapper {
      */
     void insertPromoter(@Param("promoter") YtPlatformUserPromoter promoter);
 
+    /**
+     * 更新推广应用关系
+     */
+    void updatePromoter(@Param("promoter") YtPlatformUserPromoter promoter);
+
     /**
      * 查询应用推广配置信息
      *

yt-agent/agent-service/src/main/java/com/ytpm/service/PromoterUserService.java

@@ -3,13 +3,14 @@ package com.ytpm.service;
 
 import com.ytpm.agent.param.PromoterAssignParam;
 import com.ytpm.agent.param.PromoterUserParam;
+import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.general.ResultTable;
 import com.ytpm.middle.param.MiddleUserParam;
-import com.ytpm.middle.view.MiddleUserInfo;
 import com.ytpm.oauth.model.YtPlatformUser;
 
 /**
  * 渠道推广人服务
+ *
  * @author lih
  * @date 2025-10-10 11:33
  */
@@ -20,12 +21,12 @@ public interface PromoterUserService {
     /**
      * 新增渠道推广人
      */
-    String addOne(MiddleUserParam param, MiddleUserInfo userInfo);
+    String addOne(MiddleUserParam param, AgentUserInfo userInfo);
 
     /**
      * 修改渠道推广人
      */
-    String updateOne(MiddleUserParam param, MiddleUserInfo userInfo);
+    String updateOne(MiddleUserParam param, AgentUserInfo userInfo);
 
     /**
      * 删除渠道推广人
@@ -33,7 +34,12 @@ public interface PromoterUserService {
     String deleteOne(String userId);
 
     /**
-     * 分配至渠道应用
+     * 为渠道子包应用分配推广人
      */
-    String assignmentApp(PromoterAssignParam assignParam, MiddleUserInfo userInfo);
+    String assignmentApp(PromoterAssignParam assignParam, AgentUserInfo userInfo);
+
+    /**
+     * 取消渠道子包应用推广人
+     */
+    String unAssignmentApp(PromoterAssignParam assignParam, AgentUserInfo userInfo);
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/AgentAppServiceImpl.java

@@ -4,26 +4,32 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ytpm.advertise.enums.AppCategoryEnum;
 import com.ytpm.advertise.param.RelativeChannelParam;
+import com.ytpm.agent.enums.UserTypeEnum;
 import com.ytpm.agent.model.YtApp;
 import com.ytpm.agent.model.YtAppChannelRelative;
 import com.ytpm.agent.model.YtPlatformUserApp;
+import com.ytpm.agent.model.YtPlatformUserPromoter;
 import com.ytpm.agent.param.AppListParam;
 import com.ytpm.agent.param.AppParam;
 import com.ytpm.agent.view.AgentAppView;
 import com.ytpm.agent.view.AgentEnableAppView;
 import com.ytpm.app.model.YtAppDefaultConfig;
 import com.ytpm.dao.AgentAppMapper;
+import com.ytpm.dao.AgentUserMapper;
 import com.ytpm.dao.AppChannelRelativeMapper;
 import com.ytpm.dao.AppMapper;
+import com.ytpm.dao.PromoterUserMapper;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.handle.CustomerException;
 import com.ytpm.middle.view.AppListVO;
+import com.ytpm.oauth.model.YtPlatformUser;
 import com.ytpm.service.AgentAppService;
 import com.ytpm.utils.FeignClientInvoker;
 import lombok.extern.slf4j.Slf4j;
@@ -51,6 +57,10 @@ public class AgentAppServiceImpl implements AgentAppService {
     private AppMapper appMapper;
     @Resource
     private AppChannelRelativeMapper appChannelRelativeMapper;
+    @Resource
+    private AgentUserMapper agentUserMapper;
+    @Resource
+    private PromoterUserMapper promoterUserMapper;
 
     /**
      * 查询渠道启用的应用列表
@@ -67,18 +77,22 @@ public class AgentAppServiceImpl implements AgentAppService {
     @Override
     public ResultTable<AgentAppView> searchAppList(AppListParam appListParam) {
         PageHelper.startPage(appListParam.getPage(), appListParam.getLimit());
-        List<AgentAppView> views = agentAppMapper.searchAppList(appListParam);
+        YtPlatformUser platformUser = agentUserMapper.selectPrimary(appListParam.getUserId());
+        if (platformUser != null && UserTypeEnum.PLATFORM_USER.getCode().equals(platformUser.getUserType())) {
+            List<YtPlatformUserPromoter> list = promoterUserMapper.selectPromoterByUserId(platformUser.getUserId());
+            appListParam.setAppIds(list.stream().map(YtPlatformUserPromoter::getAppId).filter(StrUtil::isNotEmpty).collect(Collectors.toList()));
+        }
         //设置报表数据
-        if(CollUtil.isEmpty(views)){
-            return ResultTable.resultTableOk(new PageInfo<>(new ArrayList<>()));
+        List<AgentAppView> views = agentAppMapper.searchAppList(appListParam);
+        if (CollUtil.isEmpty(views)) {
+            views = new ArrayList<>();
         }
         return ResultTable.resultTableOk(new PageInfo<>(views));
     }
 
     @Override
     public List<AgentAppView> searchAppIdList(AppListParam appListParam) {
-        List<AgentAppView> agentAppViews = agentAppMapper.searchAppIdList(appListParam);
-        return agentAppViews;
+        return agentAppMapper.searchAppIdList(appListParam);
     }
 
     /**

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/AgentDitchServiceImpl.java

@@ -2,15 +2,20 @@ package com.ytpm.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ytpm.agent.enums.UserTypeEnum;
 import com.ytpm.agent.model.YtApp;
 import com.ytpm.agent.model.YtDitch;
+import com.ytpm.agent.model.YtPlatformUserPromoter;
 import com.ytpm.agent.param.DitchListParam;
 import com.ytpm.agent.view.AgentDitchView;
 import com.ytpm.dao.AgentDitchMapper;
+import com.ytpm.dao.AgentUserMapper;
 import com.ytpm.dao.AppMapper;
+import com.ytpm.dao.PromoterUserMapper;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
+import com.ytpm.oauth.model.YtPlatformUser;
 import com.ytpm.service.AgentDitchService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +24,7 @@ import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 public class AgentDitchServiceImpl implements AgentDitchService {
@@ -28,11 +34,20 @@ public class AgentDitchServiceImpl implements AgentDitchService {
 
     @Resource
     private AppMapper appMapper;
+    @Resource
+    private AgentUserMapper agentUserMapper;
+    @Resource
+    private PromoterUserMapper promoterUserMapper;
 
 
     @Override
     public ResultTable<AgentDitchView> ditchList(DitchListParam param) {
         PageHelper.startPage(param.getPage(), param.getLimit());
+        YtPlatformUser platformUser = agentUserMapper.selectPrimary(param.getUserId());
+        if (platformUser != null && UserTypeEnum.PLATFORM_USER.getCode().equals(platformUser.getUserType())) {
+            List<YtPlatformUserPromoter> list = promoterUserMapper.selectPromoterByUserId(platformUser.getUserId());
+            param.setDitchIds(list.stream().map(YtPlatformUserPromoter::getDitchId).filter(Objects::nonNull).collect(Collectors.toList()));
+        }
         List<AgentDitchView> agentDitchViews = agentDitchMapper.ditchList(param);
         return ResultTable.resultTableOk(new PageInfo<>(agentDitchViews));
     }

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/PromoterUserServiceImpl.java

@@ -10,6 +10,7 @@ import com.ytpm.agent.model.YtApp;
 import com.ytpm.agent.model.YtPlatformUserPromoter;
 import com.ytpm.agent.param.PromoterAssignParam;
 import com.ytpm.agent.param.PromoterUserParam;
+import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.dao.AgentUserMapper;
 import com.ytpm.dao.AppMapper;
 import com.ytpm.dao.PromoterUserMapper;
@@ -17,10 +18,10 @@ import com.ytpm.general.RepMessage;
 import com.ytpm.general.ResultTable;
 import com.ytpm.handle.CustomerException;
 import com.ytpm.middle.param.MiddleUserParam;
-import com.ytpm.middle.view.MiddleUserInfo;
 import com.ytpm.oauth.model.YtPlatformUser;
 import com.ytpm.service.PromoterUserService;
 import com.ytpm.util.IDUtil;
+import com.ytpm.util.NumberUtils;
 import com.ytpm.util.RandomPasswordGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -28,6 +29,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -57,7 +59,7 @@ public class PromoterUserServiceImpl implements PromoterUserService {
     }
 
     @Override
-    public String addOne(MiddleUserParam param, MiddleUserInfo userInfo) {
+    public String addOne(MiddleUserParam param, AgentUserInfo userInfo) {
         //根据登录名生成登录账号
         YtPlatformUser user = new YtPlatformUser();
         user.setUserId(IDUtil.generateFlowID("yt_agent_"));
@@ -65,9 +67,12 @@ public class PromoterUserServiceImpl implements PromoterUserService {
         user.setUserType(UserTypeEnum.APP_PROMOTER.getCode());
         user.setNickName(param.getNickName());
         user.setLoginName(param.getLoginName());
-        String generatedPassword = RandomPasswordGenerator.generatePassword(8);
-        log.info("创建推广用户成功，您本次的登录密码为：{}", generatedPassword);
-        user.setEncryptPwd(new BCryptPasswordEncoder().encode(generatedPassword));
+        if (StrUtil.isEmpty(param.getPassword())) {
+            String generatedPassword = RandomPasswordGenerator.generatePassword(8);
+            log.info("创建推广用户成功，您本次的登录密码为：{}", generatedPassword);
+            param.setPassword(generatedPassword);
+        }
+        user.setEncryptPwd(new BCryptPasswordEncoder().encode(param.getPassword()));
         user.setPhone(param.getPhone());
         user.setLastLoginTime(new Date());
         user.setRegistryTime(new Date());
@@ -77,7 +82,7 @@ public class PromoterUserServiceImpl implements PromoterUserService {
     }
 
     @Override
-    public String updateOne(MiddleUserParam param, MiddleUserInfo userInfo) {
+    public String updateOne(MiddleUserParam param, AgentUserInfo userInfo) {
         YtPlatformUser platformUser = agentUserMapper.selectPrimary(param.getUserId());
         if (Objects.isNull(platformUser)) {
             return RepMessage.OBJECT_NOT_EXIST;
@@ -108,7 +113,7 @@ public class PromoterUserServiceImpl implements PromoterUserService {
     }
 
     @Override
-    public String assignmentApp(PromoterAssignParam assignParam, MiddleUserInfo userInfo) {
+    public String assignmentApp(PromoterAssignParam assignParam, AgentUserInfo userInfo) {
         YtApp ytApp = appMapper.selectPrimary(assignParam.getAppId());
         if (ytApp == null) {
             throw new CustomerException("应用不存在！");
@@ -118,6 +123,15 @@ public class PromoterUserServiceImpl implements PromoterUserService {
         if (promoter != null) {
             throw new CustomerException("该应用已绑定推广人！");
         }
+        if (StrUtil.isNotEmpty(assignParam.getShareRate())) {
+            BigDecimal shareRate = NumberUtils.rateToBigDecimal(assignParam.getShareRate());
+            if (BigDecimal.ZERO.compareTo(shareRate) > 0) {
+                throw new CustomerException("分成比例不得小于0");
+            }
+            if (new BigDecimal("1").compareTo(shareRate) < 0) {
+                throw new CustomerException("分成比例不得大于100%");
+            }
+        }
         // 开始时间为空则默认当前时间
         if (assignParam.getStartTime() == null) {
             assignParam.setStartTime(new Date());
@@ -137,4 +151,27 @@ public class PromoterUserServiceImpl implements PromoterUserService {
         log.info("[agent promoter]渠道商为应用{}指派推广人{}", ytApp.getAppId(), assignParam.getUserId());
         return RepMessage.SAVE_SUCCESS;
     }
+
+    @Override
+    public String unAssignmentApp(PromoterAssignParam assignParam, AgentUserInfo userInfo) {
+        if (StrUtil.isEmpty(assignParam.getAppId())) {
+            throw new CustomerException("appId不能为空");
+        }
+        if (StrUtil.isEmpty(assignParam.getUserId())) {
+            throw new CustomerException("userId不能为空");
+        }
+        YtApp ytApp = appMapper.selectPrimary(assignParam.getAppId());
+        if (ytApp == null) {
+            throw new CustomerException("应用不存在！");
+        }
+        List<YtPlatformUserPromoter> list = promoterUserMapper.selectPromoterByUserId(assignParam.getUserId());
+        YtPlatformUserPromoter promoter = list.stream()
+                .filter(item -> StrUtil.equals(ytApp.getAppId(), item.getAppId()))
+                .findFirst().orElse(null);
+        if (promoter != null) {
+            promoter.setEndTime(new Date());
+            promoterUserMapper.updatePromoter(promoter);
+        }
+        return RepMessage.PROCESS_SUCCESS;
+    }
 }

yt-agent/agent-service/src/main/resources/mapper/AgentAppMapper.xml

@@ -64,21 +64,24 @@
             GROUP_CONCAT( acr.network_app_id ) network_app_id,
             GROUP_CONCAT( acr.network_app_name ) network_app_name,
             u.nick_name
-        FROM
-            yt_app ya
-                JOIN yt_platform_user_app pua on ya.superior_id = pua.app_id
-                LEFT JOIN yt_app_channel_relative acr ON ya.app_id = acr.app_id
-                LEFT JOIN yt_platform_user u ON ya.user_id = u.user_id
-        WHERE
-            ya.enabled = 1 and ya.user_id = #{userId}
+        FROM yt_app ya
+        JOIN yt_platform_user_app pua on ya.superior_id = pua.app_id
+        LEFT JOIN yt_app_channel_relative acr ON ya.app_id = acr.app_id
+        LEFT JOIN yt_platform_user u ON ya.user_id = u.user_id
+        WHERE ya.enabled = 1
+        <if test="appIds == null">
+            and ya.user_id = #{userId}
+        </if>
+        <if test="appIds != null and appIds.size() > 0">
+            and ya.app_id in <foreach collection="appIds" open="(" separator="," close=")" item="appId">#{appId}</foreach>
+        </if>
         <if test="appName !=null and appName != ''">
             and ya.app_name like concat('%', #{appName} ,'%')
         </if>
         <if test="appType !=null">
             and ya.app_type = #{appType}
         </if>
-        GROUP BY
-            ya.app_id
+        GROUP BY ya.app_id
     </select>
 
     <select id="searchAppIdList" resultType="com.ytpm.agent.view.AgentAppView">

yt-agent/agent-service/src/main/resources/mapper/AgentDitchMapper.xml

@@ -45,7 +45,12 @@
             ditch_id, ditch_name, app_type, app_id, create_time
         from yt_ditch
         <where>
-            user_id = #{userId}
+            <if test="ditchIds == null">
+                user_id = #{userId}
+            </if>
+            <if test="ditchIds != null and ditchIds.size() > 0">
+                ditch_id in <foreach collection="ditchIds" item="ditchId" open="(" separator="," close=")">#{ditchId}</foreach>
+            </if>
             <if test="ditchName != null and ditchName != ''">
                 AND ditch_name LIKE CONCAT('%', #{ditchName}, '%')
             </if>

yt-agent/agent-service/src/main/resources/mapper/PromoterUserMapper.xml

@@ -4,7 +4,7 @@
 
     <insert id="insertPromoter">
         insert into yt_platform_user_promoter
-        (relation_id, paltform_user_id, promoter_user_id, ditch_id, app_id, share_rate, start_time, end_time,
+        (relation_id, platform_user_id, promoter_user_id, ditch_id, app_id, share_rate, start_time, end_time,
          operator_id, operator_time)
         values (#{promoter.relationId},
                 #{promoter.platformUserId},
@@ -18,10 +18,33 @@
                 #{promoter.operatorTime});
 
     </insert>
+    <update id="updatePromoter">
+        update yt_platform_user_promoter set
+        <if test="promoter.platformUserId != null and promoter.platformUserId != ''">
+            platform_user_id = #{promoter.platformUserId},
+        </if>
+        <if test="promoter.promoterUserId != null and promoter.promoterUserId != ''">
+            promoter_user_id = #{promoter.promoterUserId},
+        </if>
+        <if test="promoter.ditchId != null">
+            ditch_id = #{promoter.ditchId},
+        </if>
+        <if test="promoter.appId != null">
+            app_id = #{promoter.appId},
+        </if>
+        <if test="promoter.shareRate != null and promoter.shareRate != ''">
+            share_rate = #{promoter.shareRate},
+        </if>
+        <if test="promoter.endTime != null">
+            end_time = #{promoter.endTime},
+        </if>
+        operator_time = #{promoter.operatorTime}
+        where relation_id = #{promoter.relationId}
+    </update>
 
     <select id="selectPromoterByAppId" resultType="com.ytpm.agent.model.YtPlatformUserPromoter">
         select relation_id,
-               paltform_user_id,
+               platform_user_id,
                promoter_user_id,
                ditch_id,
                app_id,
@@ -37,7 +60,7 @@
     </select>
     <select id="selectPromoterByUserId" resultType="com.ytpm.agent.model.YtPlatformUserPromoter">
         select relation_id,
-               paltform_user_id,
+               platform_user_id,
                promoter_user_id,
                ditch_id,
                app_id,

yt-common/src/main/java/com/ytpm/agent/param/AppListParam.java

@@ -8,12 +8,16 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("应用列表入参")
 public class AppListParam extends PageMeta {
+    @ApiModelProperty("appID集合")
+    private List<String> appIds;
     @ApiModelProperty("app名称")
     private String appName;
     @ApiModelProperty("用户ID")

yt-common/src/main/java/com/ytpm/agent/param/DitchListParam.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
@@ -16,4 +18,5 @@ public class DitchListParam extends PageMeta {
     private String ditchName;
     private String userId;
     private String appId;
+    private List<Long> ditchIds;
 }

yt-common/src/main/java/com/ytpm/agent/view/AgentUserInfo.java

@@ -37,9 +37,6 @@ public class AgentUserInfo {
     @ApiModelProperty("用户类型")
     private Integer userType;
 
-    @ApiModelProperty("推广关联集合")
-    private List<YtPlatformUserPromoter> promoters;
-
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return Collections.emptyList();
     }

yt-common/src/main/java/com/ytpm/general/ResultTable.java

@@ -59,7 +59,7 @@ public class ResultTable<T> implements Serializable {
      * @param pageInfo 分页插件返回实体
      * @return
      */
-    public static <T> ResultTable resultTableOk(PageInfo<T> pageInfo) {
+    public static <T> ResultTable<T> resultTableOk(PageInfo<T> pageInfo) {
         //当前页
         int currentPage = pageInfo.getPageNum();
         //每页的数量
@@ -73,7 +73,7 @@ public class ResultTable<T> implements Serializable {
             list = new ArrayList<>();
         }
         PageMeta pageMeta =  new PageMeta(total, perPage, currentPage, lastPage);
-        return new ResultTable(StatusCode.OK, RepMessage.QUERY_SUCCESS, list, pageMeta);
+        return new ResultTable<>(StatusCode.OK, RepMessage.QUERY_SUCCESS, list, pageMeta);
     }
 
     /**