修改

game-business/src/main/java/com/game/business/controller/AppAgentController.java

@@ -35,7 +35,7 @@ public class AppAgentController {
     private IAppUserService appUserService;
 
     /**
-     * 下注
+     * 首页
      */
     @PostMapping(value = "/index")
     @ApiOperation(value = "首页", notes = "首页")
@@ -58,7 +58,7 @@ public class AppAgentController {
             //团队人数
             vo.setTeamUser(appUserService.getCount(userId,null,null));
             //团队充值
-            vo.setTeamRecharge(appUserCountList.stream().mapToDouble(e->e.getRechargeAmount() - e.getRechargeCommission()).sum());
+            vo.setTeamRecharge(appUserCountList.stream().mapToDouble(e->e.getRechargeAmount()).sum());
             //团队投注
             //团队直播消费
             vo.setTeamLive(appUserCountList.stream().mapToDouble(e->e.getLiveUseAmount()).sum());

game-business/src/main/java/com/game/business/domain/AppUserAgent.java

@@ -12,8 +12,6 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 用户代理表对象 app_user_agent
  *
@@ -27,8 +25,8 @@ public class AppUserAgent
         {
 private static final long serialVersionUID=1L;
 
-    /** $column.columnComment */
-    @ApiModelProperty(value = "$column.columnComment")
+    /**  */
+    @ApiModelProperty(value = "")
     @TableId(value = "id" , type = IdType.AUTO)
     private Long id;
 
@@ -44,9 +42,38 @@ private static final long serialVersionUID=1L;
     @TableField(value = "pid")
     private Long pid;
 
+    /** 顶级代理ID */
+    @ApiModelProperty(value = "顶级代理ID")
+    @Excel(name = "顶级代理ID")
+    @TableField(value = "top_id")
+    private Long topId;
+
+    /** 直播分成比例 */
+    @ApiModelProperty(value = "直播分成比例")
+    @Excel(name = "直播分成比例")
+    @TableField(value = "live_rate")
+    private Long liveRate;
+
+    /** 保底分红比例 */
+    @ApiModelProperty(value = "保底分红比例")
+    @Excel(name = "保底分红比例")
+    @TableField(value = "dividend_guarantee_rate")
+    private Long dividendGuaranteeRate;
+
+    /** 审核状态 0 待审核 1 审核/自动 2 未通过  */
+    @ApiModelProperty(value = "审核状态 0 待审核 1 审核/自动 2 未通过 ")
+    @Excel(name = "审核状态 0 待审核 1 审核/自动 2 未通过 ")
+    @TableField(value = "audit_status")
+    private String auditStatus;
+
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间")
     @TableField(value = "create_time")
     private Date createTime;
 
+    /** 更新时间 */
+    @ApiModelProperty(value = "更新时间")
+    @TableField(value = "update_time")
+    private Date updateTime;
+
 }

game-business/src/main/java/com/game/business/service/impl/AppUserAgentServiceImpl.java

@@ -68,6 +68,7 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
     @Override
     @DataSource(DataSourceType.SLAVE)
     public int updateAppUserAgent(AppUserAgent appUserAgent) {
+                appUserAgent.setUpdateTime(DateUtils.getNowDate());
         return appUserAgentMapper.updateAppUserAgent(appUserAgent);
     }
 

game-business/src/main/resources/mapper/business/AppUserAgentMapper.xml

@@ -8,11 +8,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
         <result property="pid"    column="pid"    />
+        <result property="topId"    column="top_id"    />
+        <result property="liveRate"    column="live_rate"    />
+        <result property="dividendGuaranteeRate"    column="dividend_guarantee_rate"    />
+        <result property="auditStatus"    column="audit_status"    />
         <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectAppUserAgentVo">
-        select id, user_id, pid, create_time from app_user_agent
+        select id, user_id, pid, top_id, live_rate, dividend_guarantee_rate, audit_status, create_time, update_time from app_user_agent
     </sql>
 
     <select id="selectAppUserAgentList" parameterType="com.game.business.domain.AppUserAgent" resultMap="AppUserAgentResult">
@@ -20,6 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="pid != null "> and pid = #{pid}</if>
+            <if test="topId != null "> and top_id = #{topId}</if>
+            <if test="liveRate != null "> and live_rate = #{liveRate}</if>
+            <if test="dividendGuaranteeRate != null "> and dividend_guarantee_rate = #{dividendGuaranteeRate}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
         </where>
     </select>
     
@@ -34,13 +43,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="userId != null">user_id,</if>
             <if test="pid != null">pid,</if>
+            <if test="topId != null">top_id,</if>
+            <if test="liveRate != null">live_rate,</if>
+            <if test="dividendGuaranteeRate != null">dividend_guarantee_rate,</if>
+            <if test="auditStatus != null">audit_status,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="userId != null">#{userId},</if>
             <if test="pid != null">#{pid},</if>
+            <if test="topId != null">#{topId},</if>
+            <if test="liveRate != null">#{liveRate},</if>
+            <if test="dividendGuaranteeRate != null">#{dividendGuaranteeRate},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
 
@@ -49,7 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
             <if test="pid != null">pid = #{pid},</if>
+            <if test="topId != null">top_id = #{topId},</if>
+            <if test="liveRate != null">live_rate = #{liveRate},</if>
+            <if test="dividendGuaranteeRate != null">dividend_guarantee_rate = #{dividendGuaranteeRate},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>