修改

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

@@ -84,6 +84,10 @@ public class AppAgentController extends BaseController {
         vo.setTeamUser(appUserAgentService.countAgent(userId,null,null));
         //团队充值
         vo.setTeamRecharge(appUserCountList.stream().mapToDouble(e->e.getRechargeAmount()).sum());
+        //团队充值赠送金额
+        vo.setRechargeGive(appUserCountList.stream().mapToDouble(e->e.getRechargeGive()).sum());
+        //团队充值手续费
+        vo.setRechargeCommission(appUserCountList.stream().mapToDouble(e->e.getRechargeCommission()).sum());
         //团队投注
         vo.setTeamBetting(appUserAgentService.sumBetting(DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00")
                 ,DateUtil.format(endDate,"yyyy-MM-dd").concat(" 23:59:59"),userId));

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

@@ -36,6 +36,11 @@ public class AppUserCount {
     @ApiModelProperty(value = "上级用户ID")
     private Long agentUserId;
 
+    @Excel(name = "团队顶级用户ID")
+    @TableField(value = "super_user_id")
+    @ApiModelProperty(value = "团队顶级用户ID")
+    private Long superUserId;
+
     @Excel(name = "充值金额")
     @TableField(value = "recharge_amount")
     @ApiModelProperty(value = "充值金额")

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

@@ -188,8 +188,8 @@ private static final long serialVersionUID=1L;
     private String tradeNo;
 
     /** 支付类型 1:支付宝app 2:微信app 3:ios-内购 4:手动充值 5:微信 h5支付 */
-    @ApiModelProperty(value = "支付类型 1:支付宝app 2:微信app 3:ios-内购 4:手动充值 5:微信 h5支付")
-    @Excel(name = "支付类型 1:支付宝app 2:微信app 3:ios-内购 4:手动充值 5:微信 h5支付")
+    @ApiModelProperty(value = "支付类型 1:支付宝app 2:微信app 3:ios-内购 4:手动充值 5:微信 h5支付 6: 余额兑换 7: 金币兑换")
+    @Excel(name = "支付类型 1:支付宝app 2:微信app 3:ios-内购 4:手动充值 5:微信 h5支付 6: 余额兑换 7: 金币兑换")
     @TableField(value = "type")
     private Long type;
 

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

@@ -109,7 +109,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
         queryWrapper.between(AppUsersCharge::getAddtime,beginTime,endTime);
         queryWrapper.eq(AppUsersCharge::getIsDelete,0);
         queryWrapper.eq(AppUsersCharge::getStatus,"1");
-        queryWrapper.notIn(AppUsersCharge::getType,new Integer[]{4,6,7});
+        queryWrapper.notIn(AppUsersCharge::getType,new Integer[]{6,7});
         return appUsersChargeMapper.selectList(queryWrapper);
     }
 }

game-business/src/main/java/com/game/business/task/AppUserCountTask.java

@@ -93,11 +93,14 @@ public class AppUserCountTask {
                     //充值服务费/手续费
                     appUserCount.setRechargeCommission(appUsersChargeList.stream().filter(e -> e.getUid().equals(appUser.getUserid())).mapToDouble(e -> e.getPlatformService()).sum());
                     //充值赠送余额
-                    appUserCount.setRechargeGive(finTranRecordList.stream().filter(e -> {
+                    /*appUserCount.setRechargeGive(finTranRecordList.stream().filter(e -> {
                         return e.getUid().equals(appUser.getUserid()) &&
                                 e.getTranType1().intValue() == FinTranType1.U_Income_Coin_Balance.getType() &&
                                 e.getTranType3().intValue() == FinTranType3.CHARGE_IN_REWARD.getType();
-                    }).mapToDouble(e->e.getCoinChange()).sum());
+                    }).mapToDouble(e->e.getCoinChange()).sum());      */
+                    appUserCount.setRechargeGive(appUsersChargeList.stream().filter(e -> {
+                        return e.getUid().equals(appUser.getUserid());
+                    }).mapToDouble(e->null==e.getCoinGive()?0:e.getCoinGive().doubleValue()).sum());
                     //提现服务费/手续费
                     appUserCount.setWithdrawalCommission(appUsersCashrecords.stream().filter(e -> e.getUid().equals(appUser.getUserid())).mapToDouble(e -> e.getService().doubleValue()).sum());
                     //直播消费金额
@@ -201,11 +204,14 @@ public class AppUserCountTask {
                     //充值服务费/手续费
                     appUserCount.setRechargeCommission(appUsersChargeList.stream().filter(e -> e.getUid().equals(appUser.getUserid())).mapToDouble(e -> e.getPlatformService()).sum());
                     //充值赠送余额
-                    appUserCount.setRechargeGive(finTranRecordList.stream().filter(e -> {
+                    /*appUserCount.setRechargeGive(finTranRecordList.stream().filter(e -> {
                         return e.getUid().equals(appUser.getUserid()) &&
                                 e.getTranType1().intValue() == FinTranType1.U_Income_Coin_Balance.getType() &&
                                 e.getTranType3().intValue() == FinTranType3.CHARGE_IN_REWARD.getType();
-                    }).mapToDouble(e->e.getCoinChange()).sum());
+                    }).mapToDouble(e->e.getCoinChange()).sum());*/
+                    appUserCount.setRechargeGive(appUsersChargeList.stream().filter(e -> {
+                        return e.getUid().equals(appUser.getUserid());
+                    }).mapToDouble(e->null==e.getCoinGive()?0:e.getCoinGive().doubleValue()).sum());
                     //提现服务费/手续费
                     appUserCount.setWithdrawalCommission(appUsersCashrecords.stream().filter(e -> e.getUid().equals(appUser.getUserid())).mapToDouble(e -> e.getService().doubleValue()).sum());
                     //直播消费金额

game-business/src/main/java/com/game/business/vo/AppAgentTeamVo.java

@@ -43,6 +43,15 @@ public class AppAgentTeamVo {
     @ApiModelProperty(value = "盈亏")
     private double gameAmount;
 
+    @ApiModelProperty(value = "充值金额")
+    private double rechargeAmount;
+
+    @ApiModelProperty(value = "充值手续费")
+    private double rechargeCommission;
+
+    @ApiModelProperty(value = "充值赠送金额")
+    private double rechargeGive;
+
     /** 直播分成比例 */
     @ApiModelProperty(value = "直播分成比例")
     private Long liveRate;

game-business/src/main/java/com/game/business/vo/AppUserAgentJournalIndexVO.java

@@ -12,7 +12,7 @@ public class AppUserAgentJournalIndexVO {
     @ApiModelProperty(value = "我的佣金")
     private double myCommission = 0;
 
-    @ApiModelProperty(value = "团队充值")
+    @ApiModelProperty(value = "团队充值（扣除手续费后的金额）")
     private double teamRecharge = 0;
 
     @ApiModelProperty(value = "团队投注")
@@ -27,6 +27,12 @@ public class AppUserAgentJournalIndexVO {
     @ApiModelProperty(value = "团队投注 输")
     private double teamLose = 0;
 
+    @ApiModelProperty(value = "团队充值赠送金额（余额）")
+    private double rechargeGive = 0;
+
+    @ApiModelProperty(value = "团队充值手续费")
+    private double rechargeCommission = 0;
+
     @ApiModelProperty(value = "团队人数")
     private int teamUser = 0;
 

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

@@ -139,6 +139,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and <![CDATA[ e.str_date <= #{teamDto.endTime} ]]>
                 </if>
             ) as gameAmount,
+            (
+            select IFNULL(sum(g.recharge_amount),0) from app_user_count as g where g.user_id = a.user_id
+            <if test="teamDto.beginTime != null and teamDto.beginTime != ''">
+                and <![CDATA[ g.str_date >= #{teamDto.beginTime} ]]>
+            </if>
+            <if test="teamDto.endTime != null and teamDto.endTime != ''">
+                and <![CDATA[ g.str_date <= #{teamDto.endTime} ]]>
+            </if>
+            ) as rechargeAmount,
+            (
+            select IFNULL(sum(g.recharge_commission),0) from app_user_count as h where h.user_id = a.user_id
+            <if test="teamDto.beginTime != null and teamDto.beginTime != ''">
+                and <![CDATA[ h.str_date >= #{teamDto.beginTime} ]]>
+            </if>
+            <if test="teamDto.endTime != null and teamDto.endTime != ''">
+                and <![CDATA[ h.str_date <= #{teamDto.endTime} ]]>
+            </if>
+            ) as rechargeCommission,
+            (
+            select IFNULL(sum(g.recharge_give),0) from app_user_count as i where i.user_id = a.user_id
+            <if test="teamDto.beginTime != null and teamDto.beginTime != ''">
+                and <![CDATA[ i.str_date >= #{teamDto.beginTime} ]]>
+            </if>
+            <if test="teamDto.endTime != null and teamDto.endTime != ''">
+                and <![CDATA[ i.str_date <= #{teamDto.endTime} ]]>
+            </if>
+            ) as rechargeGive,
             a.live_rate as liveRate,
             a.dividend_guarantee_rate as dividendGuaranteeRate
         from app_user_agent as a left join mugozbg_live.app_user as c on a.user_id = c.userid where (a.pid = #{teamDto.pid} or a.user_id = #{teamDto.pid})