Merge remote-tracking branch 'origin/package' into package

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/dto/TencentOrderDTO.java

@@ -87,4 +87,8 @@ public class TencentOrderDTO implements Serializable {
      * 小游戏回传的时候要
      */
     private String clickId;
+
+    private Long roleId;
+
+    private String roleName;
 }

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/dto/TtOrderRpcDTO.java

@@ -64,4 +64,8 @@ public class TtOrderRpcDTO implements Serializable {
      * 支付时间
      */
     private LocalDateTime payTime;
+
+    private Long roleId;
+
+    private String roleName;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/BackPolicyController.java

@@ -68,5 +68,8 @@ public class BackPolicyController {
         if (dto.getRechargeMinMoney().compareTo(dto.getRechargeMaxMoney()) >= 0) {
             throw new BaseException("此单的大额金额必须大于小额金额");
         }
+        if (dto.getRegPayIntervalTime() != null && dto.getRegPayIntervalTime() <= 0) {
+            throw new BaseException("注册充值回传的最大间隔时间不能小于 1");
+        }
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyDTO.java

@@ -154,5 +154,8 @@ public class GameBackPolicyDTO implements Serializable {
     @ApiModelProperty("降档级别")
     private Integer levelDown;
 
+    @ApiModelProperty("注册充值回传的最大间隔时间（超时不回传）")
+    private Long regPayIntervalTime;
+
 
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineOrderLogDTO.java

@@ -44,5 +44,11 @@ public class GameOceanengineOrderLogDTO extends BaseListDTO<GameOceanengineOrder
     private Integer backStatus;
 
     @ApiModelProperty("充值到支付的间隔时间（分）")
-    private Long regPayIntervalTime;
+    private Long regPayIntervalTimeMin;
+
+    @ApiModelProperty("充值到支付的间隔时间（分）")
+    private Long regPayIntervalTimeMax;
+
+    @ApiModelProperty("角色名称")
+    private String roleName;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameOrderDTO.java

@@ -70,5 +70,11 @@ public class GameTencentMiniGameOrderDTO extends BaseListDTO<GameTencentMiniGame
     private Integer orderStatus;
 
     @ApiModelProperty("充值到支付的间隔时间（分）")
-    private Long regPayIntervalTime;
+    private Long regPayIntervalTimeMin;
+
+    @ApiModelProperty("充值到支付的间隔时间（分）")
+    private Long regPayIntervalTimeMax;
+
+    @ApiModelProperty("角色名称")
+    private String roleName;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentOrderDTO.java

@@ -76,5 +76,11 @@ public class GameTencentOrderDTO extends BaseListDTO<GameTencentOrder> {
     private Long userActionSetId;
 
     @ApiModelProperty("充值到支付的间隔时间（分）")
-    private Long regPayIntervalTime;
+    private Long regPayIntervalTimeMin;
+
+    @ApiModelProperty("充值到支付的间隔时间（分）")
+    private Long regPayIntervalTimeMax;
+
+    @ApiModelProperty("角色名称")
+    private String roleName;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameBackPolicy.java

@@ -130,5 +130,7 @@ public class GameBackPolicy implements Serializable {
 
     private Long updateBy;
 
+    private Long regPayIntervalTime;
+
 
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineOrderLog.java

@@ -87,4 +87,8 @@ public class GameOceanengineOrderLog implements Serializable {
      */
     private Integer backStatus;
 
+    private Long roleId;
+
+    private String roleName;
+
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentMiniGameOrder.java

@@ -100,4 +100,8 @@ public class GameTencentMiniGameOrder implements Serializable {
     private Integer backStatus;
 
     private LocalDateTime createTime;
+
+    private Long roleId;
+
+    private String roleName;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentOrder.java

@@ -112,4 +112,8 @@ public class GameTencentOrder implements Serializable {
      * 回传日志
      */
     private String backLog;
+
+    private Long roleId;
+
+    private String roleName;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameBackPolicyVO.java

@@ -138,6 +138,7 @@ public class GameBackPolicyVO implements Serializable {
     private Long createBy;
 
     private String createName;
+    private Long regPayIntervalTime;
 
 
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentMiniGameBackRpcImpl.java

@@ -45,6 +45,8 @@ public class TencentMiniGameBackRpcImpl implements ITencentMiniGameBackRpc {
                 .backStatus(BackStatusEnum.NO.getBackStatus())
                 .backPolicyId(dto.getBackPolicyId())
                 .clickId(dto.getClickId())
+                .roleId(dto.getRoleId())
+                .roleName(dto.getRoleName())
                 .build();
         gameTencentMiniGameOrderService.save(orderLog);
         return ResultVO.ok(gameTencentMiniGameOrderService.orderBack(orderLog, false));

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentUserActionBackRpcImpl.java

@@ -48,6 +48,8 @@ public class TencentUserActionBackRpcImpl implements ITencentUserActionBackRpc {
                 .isBack(BackStatusEnum.NO.getBackStatus())
                 .backPolicyId(dto.getBackPolicyId())
                 .userActionSetId(dto.getUserActionSetId())
+                .roleId(dto.getRoleId())
+                .roleName(dto.getRoleName())
                 .build();
         gameTencentOrderService.save(gameTencentOrder);
         return ResultVO.ok(gameTencentOrderService.orderBack(gameTencentOrder, false));

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TtMiniGameBackRpcImpl.java

@@ -68,6 +68,8 @@ public class TtMiniGameBackRpcImpl implements ITtMiniGameBackRpc {
                 .createTime(dto.getCreateTime())
                 .payTime(dto.getPayTime())
                 .backStatus(BackStatusEnum.NO.getBackStatus())
+                .roleId(dto.getRoleId())
+                .roleName(dto.getRoleName())
                 .build();
         gameOceanengineOrderLogService.save(orderLog);
         return ResultVO.ok(gameOceanengineOrderLogService.callback(orderLog, false));

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameBackPolicyServiceImpl.java

@@ -98,6 +98,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .levelDown(dto.getLevelDown())
                 .createBy(SecurityUtil.getUserId())
                 .createTime(LocalDateTime.now())
+                .regPayIntervalTime(dto.getRegPayIntervalTime())
                 .build();
         return gameBackPolicyService.save(backPolicy);
     }
@@ -128,6 +129,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .rechargeOtherMoneyType(dto.getRechargeOtherMoneyType())
                 .rechargeOtherMoneyRate(dto.getRechargeOtherMoneyRate())
                 .levelDown(dto.getLevelDown())
+                .regPayIntervalTime(dto.getRegPayIntervalTime())
                 .createBy(old.getCreateBy())
                 .createTime(old.getCreateTime())
                 .updateBy(SecurityUtil.getUserId())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineOrderLogServiceImpl.java

@@ -73,6 +73,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
             } else {
                 GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
                 doBack = BackPolicyUtil.backOrder(orderLog.getOrderNo(), gameBackPolicy, orderLog.getAmount(),
+                        orderLog.getPayTime(), orderLog.getRegTime(),
                         () -> getOne(new LambdaQueryWrapper<GameOceanengineOrderLog>()
                                 .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
                                 .eq(GameOceanengineOrderLog::getAppId, orderLog.getAppId())
@@ -116,7 +117,9 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                 .eq(StringUtils.isNotBlank(dto.getOrderNo()), GameOceanengineOrderLog::getOrderNo, dto.getOrderNo())
                 .eq(null != dto.getBackStatus(), GameOceanengineOrderLog::getBackStatus, dto.getBackStatus())
                 .eq(null != dto.getOrderStatus(), GameOceanengineOrderLog::getOrderStatus, dto.getOrderStatus())
-                .apply(dto.getRegPayIntervalTime() != null && dto.getRegPayIntervalTime() > 0, "if(pay_time is not null, TIMESTAMPDIFF(minute, register_time, pay_time), null) > {0}", dto.getRegPayIntervalTime())
+                .like(StringUtils.isNotBlank(dto.getRoleName()), GameOceanengineOrderLog::getRoleName, dto.getRoleName())
+                .apply(dto.getRegPayIntervalTimeMin() != null, "if(pay_time is not null, TIMESTAMPDIFF(minute, reg_time, pay_time), null) >= {0}", dto.getRegPayIntervalTimeMin())
+                .apply(dto.getRegPayIntervalTimeMax() != null, "if(pay_time is not null, TIMESTAMPDIFF(minute, reg_time, pay_time), null) <= {0}", dto.getRegPayIntervalTimeMax())
                 .orderByDesc(GameOceanengineOrderLog::getCreateTime)
         );
         IPage<GameOceanengineOrderLogVO> result = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameOrderServiceImpl.java

@@ -13,10 +13,8 @@ import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentMiniGameOrderMapper;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentMiniGameOrderDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineOrderLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameOrder;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentMiniGameOrderVO;
 import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
 import com.zanxiang.game.back.serve.service.IGameTencentMiniGameBackLogService;
@@ -81,6 +79,7 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
             } else {
                 GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
                 doBack = BackPolicyUtil.backOrder(orderLog.getOrderId(), gameBackPolicy, orderLog.getRechargeMoney(),
+                        orderLog.getPayTime(), orderLog.getRegisterTime(),
                         () -> getOne(new LambdaQueryWrapper<GameTencentMiniGameOrder>()
                                 .eq(GameTencentMiniGameOrder::getGameId, orderLog.getGameId())
                                 .eq(GameTencentMiniGameOrder::getWechatAppId, orderLog.getWechatAppId())
@@ -124,6 +123,9 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
                 .eq(StringUtils.isNotBlank(dto.getOrderId()), GameTencentMiniGameOrder::getOrderId, dto.getOrderId())
                 .eq(null != dto.getBackStatus(), GameTencentMiniGameOrder::getBackStatus, dto.getBackStatus())
                 .eq(null != dto.getOrderStatus(), GameTencentMiniGameOrder::getOrderStatus, dto.getOrderStatus())
+                .like(StringUtils.isNotBlank(dto.getRoleName()), GameTencentMiniGameOrder::getRoleName, dto.getRoleName())
+                .apply(dto.getRegPayIntervalTimeMin() != null, "if(pay_time is not null, TIMESTAMPDIFF(minute, register_time, pay_time), null) >= {0}", dto.getRegPayIntervalTimeMin())
+                .apply(dto.getRegPayIntervalTimeMax() != null, "if(pay_time is not null, TIMESTAMPDIFF(minute, register_time, pay_time), null) <= {0}", dto.getRegPayIntervalTimeMax())
                 .orderByDesc(GameTencentMiniGameOrder::getCreateTime)
         );
         IPage<GameTencentMiniGameOrderVO> result = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentOrderServiceImpl.java

@@ -90,12 +90,13 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
             } else {
                 GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
                 doBack = BackPolicyUtil.backOrder(orderLog.getOrderId(), gameBackPolicy, orderLog.getRechargeMoney(),
+                        orderLog.getPayTime(), orderLog.getRegisterTime(),
                         () -> getOne(new LambdaQueryWrapper<GameTencentOrder>()
                                 .eq(GameTencentOrder::getGameId, orderLog.getGameId())
-                                .eq(GameTencentOrder::getWechatAppId, orderLog.getWechatAppId())
                                 .eq(GameTencentOrder::getAdAccountId, orderLog.getAdAccountId())
-                                .eq(GameTencentOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
+                                .eq(GameTencentOrder::getWechatAppId, orderLog.getWechatAppId())
                                 .eq(GameTencentOrder::getWechatOpenid, orderLog.getWechatOpenid())
+                                .eq(GameTencentOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                                 .last("limit 1")
                         ) == null, backUnit -> Long.valueOf(list(new LambdaQueryWrapper<GameTencentOrder>()
                                         .eq(GameTencentOrder::getGameId, orderLog.getGameId())
@@ -133,6 +134,9 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                 .eq(StringUtils.isNotBlank(dto.getOrderId()), GameTencentOrder::getOrderId, dto.getOrderId())
                 .eq(null != dto.getIsBack(), GameTencentOrder::getIsBack, dto.getIsBack())
                 .eq(null != dto.getOrderStatus(), GameTencentOrder::getOrderStatus, dto.getOrderStatus())
+                .like(StringUtils.isNotBlank(dto.getRoleName()), GameTencentOrder::getRoleName, dto.getRoleName())
+                .apply(dto.getRegPayIntervalTimeMin() != null, "if(pay_time is not null, TIMESTAMPDIFF(minute, register_time, pay_time), null) >= {0}", dto.getRegPayIntervalTimeMin())
+                .apply(dto.getRegPayIntervalTimeMax() != null, "if(pay_time is not null, TIMESTAMPDIFF(minute, register_time, pay_time), null) <= {0}", dto.getRegPayIntervalTimeMax())
                 .orderByDesc(GameTencentOrder::getCreateTime)
         );
         IPage<GameTencentOrderVO> result = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/utils/BackPolicyUtil.java

@@ -3,11 +3,14 @@ package com.zanxiang.game.back.serve.utils;
 import com.github.sd4324530.jtuple.Tuple2;
 import com.github.sd4324530.jtuple.Tuples;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
+import com.zanxiang.module.util.DateUtil;
+import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.NumberUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomUtils;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Function;
@@ -28,11 +31,19 @@ public class BackPolicyUtil {
      * @param lastBackFunction 在指定最近订单数量内是否有订单回传过
      * @return <是否回传, 回传金额>
      */
-    public static boolean backOrder(String orderId, GameBackPolicy gameBackPolicy, long rechargeMoney, FirstOrder firstOrder, Function<Integer, Integer> lastBackFunction) {
+    public static boolean backOrder(String orderId, GameBackPolicy gameBackPolicy, long rechargeMoney, LocalDateTime payTime, LocalDateTime regTime, FirstOrder firstOrder, Function<Integer, Integer> lastBackFunction) {
         if (null == gameBackPolicy) {
             log.error("订单 id[{}]通过回传策略[null]判断后，是否回传：{}.", orderId, true);
             return true;
         }
+        log.error("----orderId: {}, backPolicy: {}, money: {}", orderId, JsonUtil.toString(gameBackPolicy), rechargeMoney);
+        if (payTime != null && gameBackPolicy.getRegPayIntervalTime() != null) {
+            long regPayIntervalMinute = (DateUtil.localDateTimeToSecond(payTime) - DateUtil.localDateTimeToSecond(regTime)) / 60;
+            if (regPayIntervalMinute > gameBackPolicy.getRegPayIntervalTime()) {
+                log.error("订单 id[{}]通过回传策略[{}]判断后，超过注册充值间隔时间，不回传{}.", orderId, gameBackPolicy.getId(), gameBackPolicy.getRegPayIntervalTime());
+                return false;
+            }
+        }
         Integer firstType;
         String firstRate;
         Integer rechargeType;
@@ -66,9 +77,11 @@ public class BackPolicyUtil {
             backRate = firstRate;
         } else {
             if (firstOrder.isFirstOrder()) {
+                log.error("订单{}是首单", orderId);
                 backType = firstType;
                 backRate = firstRate;
             } else {
+                log.error("订单{}不是首单", orderId);
                 backType = rechargeType;
                 backRate = rechargeRate;
             }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AccountAgentDayController.java

@@ -1,14 +1,8 @@
 package com.zanxiang.game.data.serve.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.data.serve.pojo.dto.AgentDayAgainDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayTotalDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteTotalDTO;
-import com.zanxiang.game.data.serve.pojo.vo.AgentDayAgainVO;
-import com.zanxiang.game.data.serve.pojo.vo.GamePromoteDayTotalVO;
-import com.zanxiang.game.data.serve.pojo.vo.GamePromoteDayVO;
-import com.zanxiang.game.data.serve.pojo.vo.GamePromoteTotalVO;
+import com.zanxiang.game.data.serve.pojo.dto.*;
+import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.IAccountAgentDayService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -52,6 +46,13 @@ public class AccountAgentDayController {
         return ResultVO.ok(accountAgentDayService.accountAgentTotal(dto));
     }
 
+    @ApiOperation(value = "推广总数据总计")
+    @PreAuthorize(permissionKey = "gameData:promote:totalSum")
+    @PostMapping("/total/sum")
+    public ResultVO<GamePromoteTotalSumVO> accountAgentTotalSum(@RequestBody GamePromoteTotalSumDTO dto) {
+        return ResultVO.ok(accountAgentDayService.accountAgentTotalSum(dto));
+    }
+
     @ApiOperation(value = "推广渠道每日复充数据")
     @PreAuthorize(permissionKey = "gameData:accountAgent:again")
     @PostMapping("/again")

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteDayDTO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -18,11 +19,13 @@ public class GamePromoteDayDTO extends BasePage {
     private String sourceSystem;
     @ApiModelProperty(notes = "投手id")
     private Long sysUserId;
+    @ApiModelProperty(notes = "推广账号类型")
+    private String accountType;
     @ApiModelProperty(notes = "推广账号ID")
     private String accountId;
 
     @ApiModelProperty(notes = "投放渠道Id")
-    private Long agentId;
+    private List<Long> agentId;
 
     @ApiModelProperty(notes = "cp名")
     private String cpName;

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteDayTotalDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -19,9 +20,10 @@ public class GamePromoteDayTotalDTO {
     private Long sysUserId;
     @ApiModelProperty(notes = "推广账号ID")
     private String accountId;
-
+    @ApiModelProperty(notes = "推广账号类型")
+    private String accountType;
     @ApiModelProperty(notes = "投放渠道Id")
-    private Long agentId;
+    private List<Long> agentId;
 
     @ApiModelProperty(notes = "cp名")
     private String cpName;

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteTotalDTO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -20,9 +21,10 @@ public class GamePromoteTotalDTO extends BasePage {
     private Long sysUserId;
     @ApiModelProperty(notes = "推广账号ID")
     private String accountId;
-
+    @ApiModelProperty(notes = "推广账号类型")
+    private String accountType;
     @ApiModelProperty(notes = "投放渠道Id")
-    private Long agentId;
+    private List<Long> agentId;
 
     @ApiModelProperty(notes = "cp名")
     private String cpName;

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteTotalSumDTO.java

@@ -0,0 +1,50 @@
+package com.zanxiang.game.data.serve.pojo.dto;
+
+import com.zanxiang.game.data.serve.pojo.base.BasePage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class GamePromoteTotalSumDTO extends BasePage {
+    @ApiModelProperty(notes = "SDK来源")
+    private String sourceSystem;
+    @ApiModelProperty(notes = "投手id")
+    private Long sysUserId;
+    @ApiModelProperty(notes = "推广账号ID")
+    private String accountId;
+
+    @ApiModelProperty(notes = "推广账号类型")
+    private String accountType;
+    @ApiModelProperty(notes = "投放渠道Id")
+    private List<Long> agentId;
+
+    @ApiModelProperty(notes = "cp名")
+    private String cpName;
+
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
+    @ApiModelProperty(notes = "游戏名")
+    private String gameName;
+    @ApiModelProperty(notes = "游戏应用类型")
+    private String gameType;
+
+    @ApiModelProperty(notes = "消耗开始日期")
+    private LocalDate costBeginDay;
+    @ApiModelProperty(notes = "消耗结束日期")
+    private LocalDate costEndDay;
+
+    @ApiModelProperty(notes = "充值开始日期")
+    private LocalDate rechargeBeginDay;
+    @ApiModelProperty(notes = "充值结束日期")
+    private LocalDate rechargeEndDay;
+}

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsPromotionDay.java

@@ -0,0 +1,943 @@
+package com.zanxiang.game.data.serve.pojo.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 广告每日数据
+ * </p>
+ *
+ * @author auto
+ * @since 2023-07-27
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Table(AdsPlayerRechargeRanking.TABLE_NAME)
+@PK({"dt","sourceSystem", "promotion_id","project_id"})
+public class AdsPromotionDay implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    public static final String TABLE_NAME = "ads_promotion_day";
+
+    /**
+     * 日期
+     */
+    private LocalDate dt;
+
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
+    /**
+     * 广告ID
+     */
+    private Long promotionId;
+
+    /**
+     * 计划ID
+     */
+    private Long projectId;
+
+    /**
+     * 广告名称
+     */
+    @Column
+    private String promotionName;
+
+    /**
+     * 计划名称
+     */
+    @Column
+    private String projectName;
+
+    /**
+     * 推广账号名称
+     */
+    @Column
+    private String accountName;
+
+    /**
+     * 推广账号ID
+     */
+    @Column
+    private Long accountId;
+
+    /**
+     * 投放媒体
+     */
+    @Column
+    private String accountType;
+
+    /**
+     * 投手ID
+     */
+    @Column
+    private Long pitcherId;
+
+    /**
+     * 投手名称
+     */
+    @Column
+    private String pitcherName;
+
+    /**
+     * 渠道ID
+     */
+    @Column
+    private Long agentId;
+
+    /**
+     * 渠道名称
+     */
+    @Column
+    private String agentName;
+
+    /**
+     * 渠道标识
+     */
+    @Column
+    private String agentKey;
+
+    /**
+     * cp名称
+     */
+    @Column
+    private String cpName;
+
+    /**
+     * 游戏ID
+     */
+    @Column
+    private Long gameId;
+
+    /**
+     * 游戏名称
+     */
+    @Column
+    private String gameName;
+
+    /**
+     * 游戏应用类型
+     */
+    @Column
+    private Long classify;
+
+    /**
+     * 广告状态
+     */
+    @Column
+    private String status;
+
+    /**
+     * 创意预览
+     */
+    @Column
+    private String creativePreview;
+
+    /**
+     * 推广目标
+     */
+    @Column
+    private String landingType;
+
+    /**
+     * 出价方式
+     */
+    @Column
+    private String pricing;
+
+    /**
+     * 当前出价
+     */
+    @Column
+    private String cpaBid;
+
+    /**
+     * 深度转化ROI系数
+     */
+    @Column
+    private String roiGoal;
+
+    /**
+     * 日预算
+     */
+    @Column
+    private String budget;
+
+    /**
+     * 投放时间
+     */
+    @Column
+    private String scheduleTime;
+
+    /**
+     * 今日消耗
+     */
+    @Column
+    private BigDecimal todayCost;
+
+    /**
+     * 广告总消耗
+     */
+    @Column
+    private BigDecimal promotionTotalCost;
+
+    /**
+     * 曝光量
+     */
+    @Column
+    private Long showCount;
+
+    /**
+     * 千次曝光成本
+     */
+    @Column
+    private BigDecimal thousandDisplayPrice;
+
+    /**
+     * 点击量
+     */
+    @Column
+    private Long clickCount;
+
+    /**
+     * 点击均价
+     */
+    @Column
+    private BigDecimal avgClickCost;
+
+    /**
+     * 点击率
+     */
+    @Column
+    private BigDecimal ctr;
+
+    /**
+     * 转化目标
+     */
+    @Column
+    private String convertTarget;
+
+    /**
+     * 转化目标量
+     */
+    @Column
+    private Long convertCount;
+
+    /**
+     * 转化目标成本
+     */
+    @Column
+    private BigDecimal convertCost;
+
+    /**
+     * 目标转化率
+     */
+    @Column
+    private BigDecimal convertRate;
+
+    /**
+     * 新增用户数
+     */
+    @Column
+    private Long regNum;
+
+    /**
+     * 广告总注册人数
+     */
+    @Column
+    private Long regTotalNum;
+
+    /**
+     * 总创角人数
+     */
+    @Column
+    private Long roleTotalNum;
+
+    /**
+     * 首日创角人数
+     */
+    @Column
+    private Long firstRoleNum;
+
+    /**
+     * 新用户累计创角人数
+     */
+    @Column
+    private Long newUserTotalRoleNum;
+
+    /**
+     * 注册成本
+     */
+    @Column
+    private BigDecimal regCost;
+
+    /**
+     * 总注册成本
+     */
+    @Column
+    private BigDecimal regTotalCost;
+
+    /**
+     * 首日创角成本
+     */
+    @Column
+    private BigDecimal firstRoleCost;
+
+    /**
+     * 新用户创角成本
+     */
+    @Column
+    private BigDecimal newUserTotalRoleCost;
+
+    /**
+     * 总创角成本
+     */
+    @Column
+    private BigDecimal roleTotalCost;
+
+    /**
+     * 首日创角率
+     */
+    @Column
+    private BigDecimal firstRoleRate;
+
+    /**
+     * 新用户创角率
+     */
+    @Column
+    private BigDecimal newUserTotalRoleRate;
+
+    /**
+     * 总创角率
+     */
+    @Column
+    private BigDecimal roleTotalRate;
+
+    /**
+     * 新增付费次数
+     */
+    @Column
+    private Long firstNewUserAmountCount;
+
+    /**
+     * 新增付费人数
+     */
+    @Column
+    private Long firstNewUserAmountNum;
+
+    /**
+     * 新增付费金额
+     */
+    @Column
+    private BigDecimal firstNewUserAmount;
+
+    /**
+     * 至今付费次数
+     */
+    @Column
+    private Long newUserTotalAmountCount;
+
+    /**
+     * 至今付费人数
+     */
+    @Column
+    private Long newUserTotalAmountNum;
+
+    /**
+     * 至今付费金额
+     */
+    @Column
+    private BigDecimal newUserTotalAmount;
+
+    /**
+     * 总充值次数
+     */
+    @Column
+    private Long totalAmountCount;
+
+    /**
+     * 总充值人数
+     */
+    @Column
+    private Long totalAmountNum;
+
+    /**
+     * 总充值金额
+     */
+    @Column
+    private BigDecimal totalAmount;
+
+    /**
+     * 首日ROI
+     */
+    @Column
+    private BigDecimal firstRoi;
+
+    /**
+     * 新用户24小时充值金额
+     */
+    @Column
+    private BigDecimal twentyFourHoursAmount;
+
+    /**
+     * 新用户24小时ROI
+     */
+    @Column
+    private BigDecimal twentyFourHoursRoi;
+
+    /**
+     * 总ROI
+     */
+    @Column
+    private BigDecimal totalRoi;
+
+    /**
+     * 广告总ROI
+     */
+    @Column
+    private BigDecimal promotionTotalRoi;
+
+    /**
+     * 新增付费成本
+     */
+    @Column
+    private BigDecimal firstNewUserRechargeCost;
+
+    /**
+     * 至今付费成本
+     */
+    @Column
+    private BigDecimal newUserTotalRechargeCost;
+
+    /**
+     * 广告总付费成本
+     */
+    @Column
+    private BigDecimal totalRechargeCost;
+
+    /**
+     * 新增付费ARPPU
+     */
+    @Column
+    private BigDecimal firstNewUserArppu;
+
+    /**
+     * 至今付费ARPPU
+     */
+    @Column
+    private BigDecimal newUserTotalAmountArppu;
+
+    /**
+     * 新增付费100+用户数
+     */
+    @Column
+    private Long firstNewUserHundredUserNum;
+
+    /**
+     * 新增付费200+用户数
+     */
+    @Column
+    private Long firstNewUserTwoHundredUserNum;
+
+    /**
+     * 至今付费100+用户数
+     */
+    @Column
+    private Long newUserTotalHundredUserNum;
+
+    /**
+     * 首充50~100元用户数
+     */
+    @Column
+    private Long firstRechargeFiftyHundredNum;
+
+    /**
+     * 新增付费100+用户付费成本
+     */
+    @Column
+    private BigDecimal firstNewUserHundredUserCost;
+
+    /**
+     * 新增付费200+用户付费成本
+     */
+    @Column
+    private BigDecimal firstNewUserTwoHundredUserCost;
+
+    /**
+     * 至今付费100+用户付费成本
+     */
+    @Column
+    private BigDecimal newUserTotalHundredUserCost;
+
+    /**
+     * 首充50~100元占比
+     */
+    @Column
+    private BigDecimal firstRechargeFiftyHundredRate;
+
+    /**
+     * 首日IOS付费次数
+     */
+    @Column
+    private Long firstIosAmountCount;
+
+    /**
+     * 首日IOS付费人数
+     */
+    @Column
+    private Long firstIosAmountNum;
+
+    /**
+     * 首日IOS付费金额
+     */
+    @Column
+    private BigDecimal firstIosAmount;
+
+    /**
+     * 首日Android付费次数
+     */
+    @Column
+    private Long firstAndroidAmountCount;
+
+    /**
+     * 首日Android付费人数
+     */
+    @Column
+    private Long firstAndroidAmountNum;
+
+    /**
+     * 首日Android付费金额
+     */
+    @Column
+    private BigDecimal firstAndroidAmount;
+
+    /**
+     * 首日IOS付费人数占比
+     */
+    @Column
+    private BigDecimal firstIosAmountNumRate;
+
+    /**
+     * 首日IOS付费金额占比
+     */
+    @Column
+    private BigDecimal firstIosAmountRate;
+
+    /**
+     * 首日IOS付费ROI
+     */
+    @Column
+    private BigDecimal firstIosAmountRoi;
+
+    /**
+     * 首日Android付费人数占比
+     */
+    @Column
+    private BigDecimal firstAndroidAmountNumRate;
+
+    /**
+     * 首日Android付费金额占比
+     */
+    @Column
+    private BigDecimal firstAndroidAmountRate;
+
+    /**
+     * 首日Android付费ROI
+     */
+    @Column
+    private BigDecimal firstAndroidAmountRoi;
+
+    /**
+     * 首日付费率
+     */
+    @Column
+    private BigDecimal firstAmountRate;
+
+    /**
+     * 新增客单价
+     */
+    @Column
+    private BigDecimal firstNewUserAvgPrice;
+
+    /**
+     * 至今客单价
+     */
+    @Column
+    private BigDecimal newUserTotalAvgPrice;
+
+    /**
+     * 计划ID，消耗时间的第1天新用户充值
+     */
+    @Column
+    private BigDecimal d1;
+
+    /**
+     * 计划ID，消耗时间的第2天新用户充值
+     */
+    @Column
+    private BigDecimal d2;
+
+    /**
+     * 计划ID，消耗时间的第3天新用户充值
+     */
+    @Column
+    private BigDecimal d3;
+
+    /**
+     * 计划ID，消耗时间的第4天新用户充值
+     */
+    @Column
+    private BigDecimal d4;
+
+    /**
+     * 计划ID，消耗时间的第5天新用户充值
+     */
+    @Column
+    private BigDecimal d5;
+
+    /**
+     * 计划ID，消耗时间的第6天新用户充值
+     */
+    @Column
+    private BigDecimal d6;
+
+    /**
+     * 计划ID，消耗时间的第7天新用户充值
+     */
+    @Column
+    private BigDecimal d7;
+
+    /**
+     * 计划ID，消耗时间的第8天新用户充值
+     */
+    @Column
+    private BigDecimal d8;
+
+    /**
+     * 计划ID，消耗时间的第9天新用户充值
+     */
+    @Column
+    private BigDecimal d9;
+
+    /**
+     * 计划ID，消耗时间的第10天新用户充值
+     */
+    @Column
+    private BigDecimal d10;
+
+    /**
+     * 计划ID，消耗时间的第11天新用户充值
+     */
+    @Column
+    private BigDecimal d11;
+
+    /**
+     * 计划ID，消耗时间的第12天新用户充值
+     */
+    @Column
+    private BigDecimal d12;
+
+    /**
+     * 计划ID，消耗时间的第13天新用户充值
+     */
+    @Column
+    private BigDecimal d13;
+
+    /**
+     * 计划ID，消耗时间的第14天新用户充值
+     */
+    @Column
+    private BigDecimal d14;
+
+    /**
+     * 计划ID，消耗时间的第15天新用户充值
+     */
+    @Column
+    private BigDecimal d15;
+
+    /**
+     * 计划ID，消耗时间的第16天新用户充值
+     */
+    @Column
+    private BigDecimal d16;
+
+    /**
+     * 计划ID，消耗时间的第17天新用户充值
+     */
+    @Column
+    private BigDecimal d17;
+
+    /**
+     * 计划ID，消耗时间的第18天新用户充值
+     */
+    @Column
+    private BigDecimal d18;
+
+    /**
+     * 计划ID，消耗时间的第19天新用户充值
+     */
+    @Column
+    private BigDecimal d19;
+
+    /**
+     * 计划ID，消耗时间的第20天新用户充值
+     */
+    @Column
+    private BigDecimal d20;
+
+    /**
+     * 计划ID，消耗时间的第21天新用户充值
+     */
+    @Column
+    private BigDecimal d21;
+
+    /**
+     * 计划ID，消耗时间的第22天新用户充值
+     */
+    @Column
+    private BigDecimal d22;
+
+    /**
+     * 计划ID，消耗时间的第23天新用户充值
+     */
+    @Column
+    private BigDecimal d23;
+
+    /**
+     * 计划ID，消耗时间的第24天新用户充值
+     */
+    @Column
+    private BigDecimal d24;
+
+    /**
+     * 计划ID，消耗时间的第25天新用户充值
+     */
+    @Column
+    private BigDecimal d25;
+
+    /**
+     * 计划ID，消耗时间的第26天新用户充值
+     */
+    @Column
+    private BigDecimal d26;
+
+    /**
+     * 计划ID，消耗时间的第27天新用户充值
+     */
+    @Column
+    private BigDecimal d27;
+
+    /**
+     * 计划ID，消耗时间的第28天新用户充值
+     */
+    @Column
+    private BigDecimal d28;
+
+    /**
+     * 计划ID，消耗时间的第29天新用户充值
+     */
+    @Column
+    private BigDecimal d29;
+
+    /**
+     * 计划ID，消耗时间的第30天新用户充值
+     */
+    @Column
+    private BigDecimal d30;
+
+    /**
+     * 付费趋势第1天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da1;
+
+    /**
+     * 付费趋势第2天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da2;
+
+    /**
+     * 付费趋势第3天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da3;
+
+    /**
+     * 付费趋势第4天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da4;
+
+    /**
+     * 付费趋势第5天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da5;
+
+    /**
+     * 付费趋势第6天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da6;
+
+    /**
+     * 付费趋势第7天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da7;
+
+    /**
+     * 付费趋势第8天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da8;
+
+    /**
+     * 付费趋势第9天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da9;
+
+    /**
+     * 付费趋势第10天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da10;
+
+    /**
+     * 付费趋势第11天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da11;
+
+    /**
+     * 付费趋势第12天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da12;
+
+    /**
+     * 付费趋势第13天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da13;
+
+    /**
+     * 付费趋势第14天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da14;
+
+    /**
+     * 付费趋势第15天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da15;
+
+    /**
+     * 付费趋势第16天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da16;
+
+    /**
+     * 付费趋势第17天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da17;
+
+    /**
+     * 付费趋势第18天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da18;
+
+    /**
+     * 付费趋势第19天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da19;
+
+    /**
+     * 付费趋势第20天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da20;
+
+    /**
+     * 付费趋势第21天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da21;
+
+    /**
+     * 付费趋势第22天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da22;
+
+    /**
+     * 付费趋势第23天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da23;
+
+    /**
+     * 付费趋势第24天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da24;
+
+    /**
+     * 付费趋势第25天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da25;
+
+    /**
+     * 付费趋势第26天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da26;
+
+    /**
+     * 付费趋势第27天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da27;
+
+    /**
+     * 付费趋势第28天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da28;
+
+    /**
+     * 付费趋势第29天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da29;
+
+    /**
+     * 付费趋势第30天总：金额/人数/增/回/倍
+     */
+    @Column
+    private String da30;
+
+
+}

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GamePromoteDayVO.java

@@ -25,7 +25,8 @@ public class GamePromoteDayVO {
 
     @ApiModelProperty(notes = "渠道名称")
     private String agentName;
-
+    @ApiModelProperty(notes = "推广账号类型")
+    private String accountType;
     @ApiModelProperty(notes = "推广账号ID")
     private String accountId;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GamePromoteTotalSumVO.java

@@ -0,0 +1,244 @@
+package com.zanxiang.game.data.serve.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class GamePromoteTotalSumVO {
+
+    @ApiModelProperty(notes = "消耗")
+    private BigDecimal cost;
+
+    @ApiModelProperty(notes = "广告计划数量")
+    private Long adPlanCount;
+
+    @ApiModelProperty(notes = "曝光数")
+    private Long viewCount;
+
+    @ApiModelProperty(notes = "点击数")
+    private Long clickCount;
+
+    @ApiModelProperty(notes = "转化量")
+    private Long convertCount;
+
+    @ApiModelProperty(notes = "转化率（目标转化率）=转化量/点击量100%")
+    private BigDecimal convertRate;
+
+    @ApiModelProperty(notes = "平均转化成本=实际消耗/转化量")
+    private BigDecimal avgConvertCost;
+
+    @ApiModelProperty(notes = "深度转化量")
+    private Long deepConvertCount;
+
+    @ApiModelProperty(notes = "深度转化成本=实际消耗/深度转化量")
+    private BigDecimal deepConvertCost;
+
+    @ApiModelProperty(notes = "深度转化率=深度转化量/转化量100%")
+    private BigDecimal deepConvertRate;
+
+    @ApiModelProperty(notes = "千次曝光成本=实际消耗/曝光量1000")
+    private BigDecimal thousandViewCost;
+
+    @ApiModelProperty(notes = "点击率=点击量/曝光量100%")
+    private BigDecimal clickRate;
+
+    @ApiModelProperty(notes = "平均点击均价=实际消耗/点击量")
+    private BigDecimal avgClickCost;
+
+    @ApiModelProperty(notes = "应用下载量")
+    private Long appDownloadCount;
+
+    @ApiModelProperty(notes = "应用下载成本=实际消耗/安卓下载开始数")
+    private BigDecimal appDownloadCost;
+
+    @ApiModelProperty(notes = "应用下载率=安卓下载开始数/点击数")
+    private BigDecimal appDownloadRate;
+
+    @ApiModelProperty(notes = "应用下载完成量")
+    private Long downloadFinish;
+
+    @ApiModelProperty(notes = "应用安装量")
+    private Long appInstallCount;
+
+    @ApiModelProperty(notes = "应用安装成本=实际消耗/安卓安装完成数")
+    private BigDecimal appInstallCost;
+
+    @ApiModelProperty(notes = "应用安装率=安卓安装完成数/安卓下载完成数")
+    private BigDecimal appInstallRate;
+
+    @ApiModelProperty(notes = "应用下载完成成本=实际消耗/安卓下载完成数")
+    private BigDecimal downloadFinishCost;
+
+    @ApiModelProperty(notes = "应用下载完成率=安卓下载完成数/安卓下载开始数")
+    private BigDecimal downloadFinishRate;
+
+    @ApiModelProperty(notes = "应用激活数")
+    private Long appActiveCount;
+
+    @ApiModelProperty(notes = "应用激活成本=实际消耗/激活数")
+    private BigDecimal appActiveCost;
+
+    @ApiModelProperty(notes = "应用激活率=激活数/点击数100%")
+    private BigDecimal appActiveRate;
+
+    @ApiModelProperty(notes = "注册人数")
+    private Long regUserCount;
+
+    @ApiModelProperty(notes = "注册成本=实际消耗/注册人数")
+    private BigDecimal regCost;
+
+    @ApiModelProperty(notes = "首日新用户充值次数")
+    private Long firstUserRechargeCount;
+
+    @ApiModelProperty(notes = "首日新用户充值人数")
+    private Long firstUserRechargeUser;
+
+    @ApiModelProperty(notes = "首日新用户充值金额")
+    private BigDecimal firstUserRechargeMoney;
+
+    @ApiModelProperty(notes = "新用户充值次数")
+    private Long userRechargeCount;
+
+    @ApiModelProperty(notes = "新用户充值人数")
+    private Long userRechargeUser;
+
+    @ApiModelProperty(notes = "不展示字段--新用户复充人数")
+    private Long repeatRechargeUser;
+
+    @ApiModelProperty(notes = "新用户充值金额")
+    private BigDecimal userRechargeMoney;
+
+    @ApiModelProperty(notes = "老用户充值次数")
+    private Long oldUserRechargeCount;
+
+    @ApiModelProperty(notes = "老用户充值人数")
+    private Long oldUserRechargeUser;
+
+    @ApiModelProperty(notes = "老用户充值金额")
+    private BigDecimal oldUserRechargeMoney;
+
+    @ApiModelProperty(notes = "账面充值次数")
+    private Long showRechargeCount;
+
+    @ApiModelProperty(notes = "账面充值人数")
+    private Long showRechargeUser;
+
+    @ApiModelProperty(notes = "账面充值金额")
+    private BigDecimal showRechargeMoney;
+
+    @ApiModelProperty(notes = "新用户累计充值次数")
+    private Long newUserRechargeCount;
+
+    @ApiModelProperty(notes = "新用户累计充值人数")
+    private Long newUserRechargeUser;
+
+    @ApiModelProperty(notes = "新用户累计充值金额")
+    private BigDecimal newUserRechargeMoney;
+
+    @ApiModelProperty(notes = "首日回收率=首日新用户充值金额/实际消耗")
+    private BigDecimal firstRecoveryRate;
+
+    @ApiModelProperty(notes = "当日回收率=新用户累计充值金额/实际消耗")
+    private BigDecimal todayRecoveryRate;
+
+    @ApiModelProperty(notes = "回收率=新用户充值金额/实际消耗")
+    private BigDecimal recoveryRate;
+
+    @ApiModelProperty(notes = "毛利额=新用户累计充值金额-实际消耗")
+    private BigDecimal grossMargin;
+
+    @ApiModelProperty(notes = "3日ROI=新用户3日累计充值金额/实际消耗")
+    private BigDecimal roiDay3;
+
+    @ApiModelProperty(notes = "5日ROI=新用户5日累计充值金额/实际消耗")
+    private BigDecimal roiDay5;
+
+    @ApiModelProperty(notes = "7日ROI=新用户7日累计充值金额/实际消耗")
+    private BigDecimal roiDay7;
+
+    @ApiModelProperty(notes = "15日ROI=新用户15日累计充值金额/实际消耗")
+    private BigDecimal roiDay15;
+
+    @ApiModelProperty(notes = "30日ROI=新用户30日累计充值金额/实际消耗")
+    private BigDecimal roiDay30;
+
+    @ApiModelProperty(notes = "60日ROI=新用户60日累计充值金额/实际消耗")
+    private BigDecimal roiDay60;
+
+    @ApiModelProperty(notes = "180日ROI=新用户180日累计充值金额/实际消耗")
+    private BigDecimal roiDay180;
+
+    @ApiModelProperty(notes = "一年ROI=新用户一年累计充值金额/实际消耗")
+    private BigDecimal roiYear1;
+
+    @ApiModelProperty(notes = "首日付费率=首日新用户充值人数/注册人数")
+    private BigDecimal firstRechargeRate;
+
+    @ApiModelProperty(notes = "新用户付费率=新用户充值人数/注册人数")
+    private BigDecimal userRechargeRate;
+
+    @ApiModelProperty(notes = "当天付费率=新用户累计充值人数/注册人数")
+    private BigDecimal todayRechargeRate;
+
+    @ApiModelProperty(notes = "新用户付费比=新用户充值人数/账面充值人数")
+    private BigDecimal newUserRechargeRatio;
+
+    @ApiModelProperty(notes = "首日客单价=首日新用户充值金额/首日新用户充值次数")
+    private BigDecimal avgFirstUserRecharge;
+
+    @ApiModelProperty(notes = "新用户客单价=新用户充值金额/新用户充值次数")
+    private BigDecimal avgUserRecharge;
+
+    @ApiModelProperty(notes = "当天客单价=新用户累计充值金额/新用户累计充值次数")
+    private BigDecimal avgTodayRecharge;
+
+    @ApiModelProperty(notes = "账面客单价=账面充值金额/账面充值次数")
+    private BigDecimal avgShowUserRecharge;
+
+    @ApiModelProperty(notes = "首日充值成本=实际消耗/首日新用户充值人数")
+    private BigDecimal firstRechargeCost;
+
+    @ApiModelProperty(notes = "新用户充值成本=实际消耗/新用户充值人数")
+    private BigDecimal userRechargeCost;
+
+    @ApiModelProperty(notes = "当天充值成本=实际消耗/首日新用户充值人数")
+    private BigDecimal todayRechargeCost;
+
+    @ApiModelProperty(notes = "复充率=新用户复充人数/新用户充值人数")
+    private BigDecimal repeatRechargeRate;
+
+    @ApiModelProperty(notes = "新用户复充率=新用户复充人数/新用户累计充值人数")
+    private BigDecimal userRepeatRechargeRate;
+
+    @ApiModelProperty(notes = "当天复充率=复充人数/新用户累计充值人数")
+    private BigDecimal todayRepeatRechargeRate;
+
+    @ApiModelProperty(notes = "新增注册Arpu=新用户累计充值金额/注册人数")
+    private BigDecimal newRegArpu;
+
+    @ApiModelProperty(notes = "首日付费Arpu=首日新用户充值金额/首日新用户充值人数")
+    private BigDecimal firstRechargeArpu;
+
+    @ApiModelProperty(notes = "新用户付费Arpu=新用户充值金额/新用户充值人数")
+    private BigDecimal userRechargeArpu;
+
+    @ApiModelProperty(notes = "当天付费Arpu=新用户累计充值金额/新用户累计充值人数")
+    private BigDecimal todayRechargeArpu;
+
+    @ApiModelProperty(notes = "账面Arpu=账面充值金额/账面充值人数")
+    private BigDecimal showRechargeArpu;
+
+    @ApiModelProperty(notes = "单日付费100+人数")
+    private String hundredUserNum;
+
+    @ApiModelProperty(notes = "单日付费100+成本")
+    private String hundredUserNumCost;
+}

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GamePromoteTotalVO.java

@@ -24,7 +24,8 @@ public class GamePromoteTotalVO {
 
     @ApiModelProperty(notes = "渠道名称")
     private String agentName;
-
+    @ApiModelProperty(notes = "推广账号类型")
+    private String accountType;
     @ApiModelProperty(notes = "推广账号ID")
     private String accountId;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/IAccountAgentDayService.java

@@ -1,13 +1,7 @@
 package com.zanxiang.game.data.serve.service;
 
-import com.zanxiang.game.data.serve.pojo.dto.AgentDayAgainDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayTotalDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteTotalDTO;
-import com.zanxiang.game.data.serve.pojo.vo.AgentDayAgainVO;
-import com.zanxiang.game.data.serve.pojo.vo.GamePromoteDayTotalVO;
-import com.zanxiang.game.data.serve.pojo.vo.GamePromoteDayVO;
-import com.zanxiang.game.data.serve.pojo.vo.GamePromoteTotalVO;
+import com.zanxiang.game.data.serve.pojo.dto.*;
+import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.utils.Page;
 
 import java.time.LocalDate;
@@ -42,4 +36,6 @@ public interface IAccountAgentDayService {
      * @return
      */
     Map<LocalDate, List<AgentDayAgainVO>> accountAgentDayAgain(AgentDayAgainDTO dto);
+
+    GamePromoteTotalSumVO accountAgentTotalSum(GamePromoteTotalSumDTO dto);
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/AccountAgentDayServiceImpl.java

@@ -3,10 +3,7 @@ package com.zanxiang.game.data.serve.service.impl;
 import com.google.common.base.CaseFormat;
 import com.google.gson.Gson;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.data.serve.pojo.dto.AgentDayAgainDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayTotalDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GamePromoteTotalDTO;
+import com.zanxiang.game.data.serve.pojo.dto.*;
 import com.zanxiang.game.data.serve.pojo.entity.AdsAccountAgentDay;
 import com.zanxiang.game.data.serve.pojo.entity.AdsAgentDayAgain;
 import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
@@ -72,8 +69,11 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("account_id", dto.getAccountId());
         }
-        if (null != dto.getAgentId()) {
-            cri.where().andEquals("agent_id", dto.getAgentId());
+        if (StringUtils.isNotBlank(dto.getAccountType())) {
+            cri.where().andEquals("account_type", dto.getAccountType());
+        }
+        if (!CollectionUtils.isEmpty(dto.getAgentId())) {
+            cri.where().andInList("agent_id", dto.getAgentId());
         }
         if (StringUtils.isNotBlank(dto.getCpName())) {
             cri.where().andLike("game_cp", dto.getCpName());
@@ -216,8 +216,11 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("account_id", dto.getAccountId());
         }
-        if (null != dto.getAgentId()) {
-            cri.where().andEquals("agent_id", dto.getAgentId());
+        if (StringUtils.isNotBlank(dto.getAccountType())) {
+            cri.where().andEquals("account_type", dto.getAccountType());
+        }
+        if (!CollectionUtils.isEmpty(dto.getAgentId())) {
+            cri.where().andInList("agent_id", dto.getAgentId());
         }
         if (StringUtils.isNotBlank(dto.getCpName())) {
             cri.where().andLike("game_cp", dto.getCpName());
@@ -276,8 +279,11 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("a.account_id", dto.getAccountId());
         }
-        if (null != dto.getAgentId()) {
-            cri.where().andEquals("a.agent_id", dto.getAgentId());
+        if (StringUtils.isNotBlank(dto.getAccountType())) {
+            cri.where().andEquals("account_type", dto.getAccountType());
+        }
+        if (!CollectionUtils.isEmpty(dto.getAgentId())) {
+            cri.where().andInList("agent_id", dto.getAgentId());
         }
         if (StringUtils.isNotBlank(dto.getCpName())) {
             cri.where().andLike("a.game_cp", dto.getCpName());
@@ -436,7 +442,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                         BigDecimal.ZERO:item.getUserRechargeMoney().divide(BigDecimal.valueOf(item.getUserRechargeCount()),4, RoundingMode.DOWN));
 
                 item.setUserRechargeCost(item.getUserRechargeUser() == 0 ?
-                        BigDecimal.ZERO:item.getCost().divide(BigDecimal.valueOf(item.getUserRechargeUser()),4, RoundingMode.DOWN));
+                        BigDecimal.ZERO:item.getCost().divide(BigDecimal.valueOf(item.getUserRechargeUser()),2, RoundingMode.DOWN));
 
                 item.setRepeatRechargeRate(item.getUserRechargeUser() == 0 ?
                         BigDecimal.ZERO:BigDecimal.valueOf(item.getRepeatRechargeUser()).divide(BigDecimal.valueOf(item.getUserRechargeUser()),4, RoundingMode.DOWN));
@@ -556,6 +562,217 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         return map;
     }
 
+    @Override
+    public GamePromoteTotalSumVO accountAgentTotalSum(GamePromoteTotalSumDTO dto) {
+        Long sysUserId = SecurityUtil.isAdmin() ? null : SecurityUtil.getUserId();
+        sysUserId = null == dto.getSysUserId() ? sysUserId : dto.getSysUserId();
+        dto.setSysUserId(sysUserId);
+        if (null == dto.getCostEndDay() || null == dto.getCostBeginDay()) {
+            dto.setCostBeginDay(LocalDate.now());
+            dto.setCostEndDay(LocalDate.now());
+        }
+        if (null == dto.getRechargeEndDay() || null == dto.getRechargeBeginDay()) {
+            dto.setRechargeEndDay(LocalDate.now());
+            dto.setRechargeBeginDay(LocalDate.now());
+        }
+        // 推广总计
+        SimpleCriteria cri = getSimpleCriteria(dto);
+        if (null != dto.getCostBeginDay()) {
+            cri.where().and("a.dt", ">=", dto.getCostBeginDay());
+        }
+        if (null != dto.getCostEndDay()) {
+            cri.where().and("a.dt", "<=", dto.getCostEndDay());
+        }
+        Sql sql = Sqls.queryEntity(accountAgentTotalSumSql() + "$condition");
+        Entity<GamePromoteTotalSumVO> entity = dao.getEntity(GamePromoteTotalSumVO.class);
+        sql.setEntity(entity).setCondition(cri);
+        dao.execute(sql);
+        GamePromoteTotalSumVO gamePromoteTotalSumVO = sql.getObject(GamePromoteTotalSumVO.class);
+
+        //账面总计
+        SimpleCriteria showCri = getSimpleCriteria(dto);
+        if (null != dto.getRechargeBeginDay()) {
+            showCri.where().and("a.dt", ">=", dto.getRechargeBeginDay());
+        }
+        if (null != dto.getRechargeEndDay()) {
+            showCri.where().and("a.dt", "<=", dto.getRechargeEndDay());
+        }
+        String show = """
+                select
+                ifnull(sum(a.amount_count),0) as show_recharge_count,
+                ifnull(sum(a.amount_num),0) as show_recharge_user,
+                ifnull(sum(a.amount),0) as show_recharge_money,
+                round(if(sum(a.amount_count) > 0, sum(a.amount) / sum(a.amount_count), 0), 4) as avg_show_user_recharge,
+                round(if(sum(a.amount_num) > 0, sum(a.amount) / sum(a.amount_num), 0), 4) as show_recharge_arpu
+                from
+                ads_account_agent_day a
+                """;
+        Sql showSql = Sqls.queryEntity(show + "$condition");
+        Entity<ShowRecharge> showEntity = dao.getEntity(ShowRecharge.class);
+        showSql.setEntity(showEntity).setCondition(showCri);
+        dao.execute(showSql);
+        ShowRecharge showRecharge = showSql.getObject(ShowRecharge.class);
+        if (null != showRecharge) {
+            gamePromoteTotalSumVO.setShowRechargeArpu(showRecharge.showRechargeArpu);
+            gamePromoteTotalSumVO.setShowRechargeCount(showRecharge.getShowRechargeCount());
+            gamePromoteTotalSumVO.setShowRechargeMoney(showRecharge.showRechargeMoney);
+            gamePromoteTotalSumVO.setShowRechargeUser(showRecharge.getShowRechargeUser());
+            gamePromoteTotalSumVO.setAvgShowUserRecharge(showRecharge.avgShowUserRecharge);
+        } else {
+            gamePromoteTotalSumVO.setShowRechargeArpu(BigDecimal.ZERO);
+            gamePromoteTotalSumVO.setShowRechargeCount(0L);
+            gamePromoteTotalSumVO.setShowRechargeMoney(BigDecimal.ZERO);
+            gamePromoteTotalSumVO.setShowRechargeUser(0L);
+            gamePromoteTotalSumVO.setAvgShowUserRecharge(BigDecimal.ZERO);
+        }
+
+        // dayN总计
+        SimpleCriteria agentAccountCri = getSimpleCriteria(dto);
+        if (null != dto.getCostBeginDay()) {
+            agentAccountCri.where().and("a.dt", ">=", dto.getCostBeginDay());
+        }
+        if (null != dto.getCostEndDay()) {
+            agentAccountCri.where().and("a.dt", "<=", dto.getCostEndDay());
+        }
+        agentAccountCri.groupBy("a.account_id,a.agent_id,a.source_system");
+        Sql agentAccountSql = Sqls.queryEntity(accountAgentTotalSumDayNSql() + "$condition");
+        Entity<AgentAccount> agentAccountEntity = dao.getEntity(AgentAccount.class);
+        agentAccountSql.setEntity(agentAccountEntity).setCondition(agentAccountCri);
+        dao.execute(agentAccountSql);
+        List<AgentAccount> agentAccountList = agentAccountSql.getList(AgentAccount.class);
+        //渠道注册时间内的dayn充值数据，获取表ads_dayn_amount的json数据
+        Map<String, Object> dayNMap = new HashMap<>(4);
+        dayNMap.put("beginDay", dto.getCostBeginDay());
+        dayNMap.put("endDay", dto.getCostEndDay());
+        Sql sqlDayN = Sqls.queryString("""
+                select dayN
+                from ads_dayn_amount
+                where
+                dt>=@beginDay and dt<=@endDay
+                and account_id = @accountId
+                and agent_id = @agentId
+                and source_system = @sourceSystem
+                """);
+        DayN dayNTotal = agentAccountList.stream().map(item -> {
+            dayNMap.put("accountId", item.getAccountId());
+            dayNMap.put("agentId", item.getAgentId());
+            dayNMap.put("sourceSystem", item.getSourceSystem());
+            sqlDayN.setParams(dayNMap);
+            dao.execute(sqlDayN);
+            List<String> dayNList = sqlDayN.getList(String.class);
+            DayN dayN = null;
+            //ads_dayn_amount存在充值数据
+            if (!CollectionUtils.isEmpty(dayNList)) {
+                Gson gson = new Gson();
+                List<Map<String, String>> jsonList = gson.fromJson(dayNList.toString(), ArrayList.class);
+
+                Map<String, String> resultMap = new HashMap<>();
+                resultMap.put("dayN", "0.00-0-0-0");
+                for (Map<String, String> jsonMap : jsonList) {
+                    for (Map.Entry<String, String> entry : jsonMap.entrySet()) {
+                        String key = entry.getKey();
+                        String value = entry.getValue();
+                        String[] parts = value.split("-");
+                        if (DateUtil.parseLocalDate(key).compareTo(dto.getRechargeBeginDay()) >= 0
+                                && DateUtil.parseLocalDate(key).compareTo(dto.getRechargeEndDay()) <= 0) {
+                            String[] existingParts = resultMap.get("dayN").split("-");
+                            BigDecimal money = new BigDecimal(existingParts[0]).add(new BigDecimal(parts[0]));
+                            int count = Integer.parseInt(existingParts[1]) + Integer.parseInt(parts[1]);
+                            int num = Integer.parseInt(existingParts[2]) + Integer.parseInt(parts[2]);
+                            int repeatNum = Integer.parseInt(existingParts[3]) + Integer.parseInt(parts[3]);
+                            String newValue = money + "-" + count + "-" + num + "-" + repeatNum;
+                            resultMap.put("dayN", newValue);
+                        }
+                    }
+                }
+                if (!resultMap.isEmpty() && !resultMap.get("dayN").isEmpty()) {
+                    String[] parts = resultMap.get("dayN").split("-");
+                    dayN = DayN.builder()
+                            .rechargeMoney(new BigDecimal(parts[0]))
+                            .rechargeCount(Long.valueOf(parts[1]))
+                            .rechargeNum(Long.valueOf(parts[2]))
+                            .repeatNum(Long.valueOf(parts[3]))
+                            .build();
+                }
+            }
+            return dayN;
+        }).filter(Objects::nonNull).reduce((accumulator, currentItem) -> {
+            // 如果 accumulator 为空，直接返回 currentItem
+            accumulator.setRechargeCount(accumulator.getRechargeCount() + currentItem.getRechargeCount());
+            accumulator.setRechargeMoney(accumulator.getRechargeMoney().add(currentItem.getRechargeMoney()));
+            accumulator.setRechargeNum(accumulator.getRechargeNum() + currentItem.getRechargeNum());
+            accumulator.setRepeatNum(accumulator.getRepeatNum() + currentItem.getRepeatNum());
+            // 其他字段相加的逻辑
+            return accumulator;
+        }).orElse(new DayN());
+
+        //充值时间范围内存在充值数据
+        gamePromoteTotalSumVO.setUserRechargeMoney(dayNTotal.getRechargeMoney());
+        gamePromoteTotalSumVO.setUserRechargeCount(dayNTotal.getRechargeCount());
+        gamePromoteTotalSumVO.setUserRechargeUser(dayNTotal.getRechargeNum());
+        gamePromoteTotalSumVO.setRepeatRechargeUser(dayNTotal.getRepeatNum());
+        gamePromoteTotalSumVO.setUserRechargeArpu(gamePromoteTotalSumVO.getUserRechargeUser() == 0 ?
+                BigDecimal.ZERO : gamePromoteTotalSumVO.getUserRechargeMoney().divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getUserRechargeUser()), 4, RoundingMode.DOWN));
+
+        gamePromoteTotalSumVO.setOldUserRechargeMoney(gamePromoteTotalSumVO.getShowRechargeMoney().subtract(gamePromoteTotalSumVO.getUserRechargeMoney()));
+        gamePromoteTotalSumVO.setOldUserRechargeCount(gamePromoteTotalSumVO.getShowRechargeCount() - gamePromoteTotalSumVO.getUserRechargeCount());
+        gamePromoteTotalSumVO.setOldUserRechargeUser(gamePromoteTotalSumVO.getShowRechargeUser() - gamePromoteTotalSumVO.getUserRechargeUser());
+
+        gamePromoteTotalSumVO.setRecoveryRate(gamePromoteTotalSumVO.getCost().compareTo(BigDecimal.ZERO) == 0 ?
+                BigDecimal.ZERO : gamePromoteTotalSumVO.getUserRechargeMoney().divide(gamePromoteTotalSumVO.getCost(), 4, RoundingMode.DOWN));
+
+        gamePromoteTotalSumVO.setUserRechargeRate(gamePromoteTotalSumVO.getRegUserCount() == 0 ?
+                BigDecimal.ZERO : BigDecimal.valueOf(gamePromoteTotalSumVO.getUserRechargeUser()).divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getRegUserCount()), 4, RoundingMode.DOWN));
+
+        gamePromoteTotalSumVO.setNewUserRechargeRatio(gamePromoteTotalSumVO.getShowRechargeUser() == 0 ?
+                BigDecimal.ZERO : BigDecimal.valueOf(gamePromoteTotalSumVO.getUserRechargeUser()).divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getShowRechargeUser()), 4, RoundingMode.DOWN));
+
+        gamePromoteTotalSumVO.setAvgUserRecharge(gamePromoteTotalSumVO.getUserRechargeCount() == 0 ?
+                BigDecimal.ZERO : gamePromoteTotalSumVO.getUserRechargeMoney().divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getUserRechargeCount()), 4, RoundingMode.DOWN));
+
+        gamePromoteTotalSumVO.setUserRechargeCost(gamePromoteTotalSumVO.getUserRechargeUser() == 0 ?
+                BigDecimal.ZERO : gamePromoteTotalSumVO.getCost().divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getUserRechargeUser()), 2, RoundingMode.DOWN));
+
+        gamePromoteTotalSumVO.setRepeatRechargeRate(gamePromoteTotalSumVO.getUserRechargeUser() == 0 ?
+                BigDecimal.ZERO : BigDecimal.valueOf(gamePromoteTotalSumVO.getRepeatRechargeUser()).divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getUserRechargeUser()), 4, RoundingMode.DOWN));
+        gamePromoteTotalSumVO.setUserRepeatRechargeRate(gamePromoteTotalSumVO.getNewUserRechargeUser() == 0 ?
+                BigDecimal.ZERO : BigDecimal.valueOf(gamePromoteTotalSumVO.getRepeatRechargeUser()).divide(BigDecimal.valueOf(gamePromoteTotalSumVO.getNewUserRechargeUser()), 4, RoundingMode.DOWN));
+        return gamePromoteTotalSumVO;
+    }
+
+    private SimpleCriteria getSimpleCriteria(GamePromoteTotalSumDTO dto) {
+        SimpleCriteria cri = Cnd.cri();
+        // 组装条件
+        if (null != dto.getSysUserId()) {
+            cri.where().andEquals("a.pitcher_id", dto.getSysUserId());
+        }
+        if (StringUtils.isNotBlank(dto.getAccountId())) {
+            cri.where().andEquals("a.account_id", dto.getAccountId());
+        }
+        if (StringUtils.isNotBlank(dto.getAccountType())) {
+            cri.where().andEquals("account_type", dto.getAccountType());
+        }
+        if (!CollectionUtils.isEmpty(dto.getAgentId())) {
+            cri.where().andInList("agent_id", dto.getAgentId());
+        }
+        if (StringUtils.isNotBlank(dto.getCpName())) {
+            cri.where().andLike("a.game_cp", dto.getCpName());
+        }
+        if (StringUtils.isNotBlank(dto.getGameName())) {
+            cri.where().andLike("a.game_name", dto.getGameName());
+        }
+        if (StringUtils.isNotBlank(dto.getGameType())) {
+            cri.where().andEquals("a.game_type", dto.getGameType());
+        }
+        if (null != dto.getGameId()) {
+            cri.where().andEquals("a.game_id", dto.getGameId());
+        }
+        if (StringUtils.isNotBlank(dto.getSourceSystem())) {
+            cri.where().andEquals("a.source_system", dto.getSourceSystem());
+        }
+        return cri;
+    }
+
     /**
      * 初始化List数据
      * @param list 需要初始化的数据
@@ -635,6 +852,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	source_system,
                 	agent_id,
                 	agent_name,
+                	account_type,
                 	account_id,
                 	agent_id,
                 	pitcher AS sys_user_name,
@@ -789,20 +1007,109 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	round(if(sum(first_new_user_amount_count) > 0, sum(first_new_user_amount) / sum(first_new_user_amount_count), 0), 4) as avg_first_user_recharge,
                 	round(if(sum(buy_new_user_total_amount_count) > 0, sum(buy_new_user_total_amount) / sum(buy_new_user_total_amount_count), 0), 4) as avg_buy_user_recharge,
                 	round(if(sum(amount_count) > 0, sum(amount) / sum(amount_count), 0), 4) as avg_show_user_recharge,
-                	round(if(sum(first_new_user_amount_num) > 0, sum(cost) / sum(first_new_user_amount_num), 0), 4) as first_recharge_cost,
-                	round(if(sum(buy_new_user_total_amount_num) > 0, sum(cost) / sum(buy_new_user_total_amount_num), 0), 4) as buy_user_recharge_cost,
+                	round(if(sum(first_new_user_amount_num) > 0, sum(cost) / sum(first_new_user_amount_num), 0), 2) as first_recharge_cost,
+                	round(if(sum(buy_new_user_total_amount_num) > 0, sum(cost) / sum(buy_new_user_total_amount_num), 0), 2) as buy_user_recharge_cost,
                 	round(if(sum(new_user_total_amount_num) > 0, sum(reg_order_user_again) / sum(new_user_total_amount_num), 0), 4) as repeat_recharge_rate,
                 	round(if(sum(register_num) > 0, sum(new_user_total_amount) / sum(register_num), 0), 4) as new_reg_arpu,
                 	round(if(sum(first_new_user_amount_num) > 0, sum(first_new_user_amount) / sum(first_new_user_amount_num), 0), 4) as first_recharge_arpu,
                 	round(if(sum(new_user_total_amount_num) > 0, sum(new_user_total_amount) / sum(new_user_total_amount_num), 0), 4) as today_recharge_arpu,
                 	round(if(sum(amount_num) > 0, sum(amount) / sum(amount_num), 0), 4) as show_recharge_arpu,
                 	sum(hundred_user_num) as hundred_user_num,
-                	round(if(sum(hundred_user_num) > 0, sum(cost) / sum(hundred_user_num), 0), 4) as hundred_user_num_cost
+                	round(if(sum(hundred_user_num) > 0, sum(cost) / sum(hundred_user_num), 0), 2) as hundred_user_num_cost
                 from
                 	ads_account_agent_day
                 """;
     }
 
+    /**
+     * 推广总数据SQL
+     * @return
+     */
+    private String accountAgentTotalSumDayNSql() {
+        return """
+                select
+                a.source_system as source_system,
+                a.agent_id as agent_id,
+                a.account_id as account_id
+                from
+                	ads_account_agent_day a
+                """;
+    }
+
+    /**
+     * 推广总数据SQL
+     * @return
+     */
+    private String accountAgentTotalSumSql() {
+        return """
+                select
+                	sum(a.cost) as cost,
+                	sum(a.plan_count) as ad_plan_count,
+                	sum(a.view_count) as view_count,
+                	sum(a.click_count) as click_count,
+                	sum(a.change_count) as convert_count,
+                	round(if(sum(a.click_count) > 0, sum(a.change_count) / sum(a.click_count), 0), 4) as convert_rate,
+                	round(if(sum(a.change_count) > 0, sum(a.cost) / sum(a.change_count), 0), 2) as avg_convert_cost,
+                	sum(a.depth_change_count) as deep_convert_count,
+                	round(if(sum(a.change_count) > 0, sum(a.depth_change_count) / sum(a.change_count), 0), 4) as deep_convert_rate,
+                	round(if(sum(a.depth_change_count) > 0, sum(a.cost) / sum(a.depth_change_count), 0), 2) as deep_convert_cost,
+                	round(if(sum(a.view_count) > 0, sum(a.cost) / sum(a.view_count) * 1000, 0), 2) as thousand_view_cost,
+                	round(if(sum(a.view_count) > 0, sum(a.click_count) / sum(a.view_count), 0), 4) as click_rate,
+                	round(if(sum(a.click_count) > 0, sum(a.cost) / sum(a.click_count), 0), 2) as avg_click_cost,
+                	sum(a.download_start) as app_download_count,
+                	round(if(sum(a.download_start) > 0, sum(a.cost) / sum(a.download_start), 0), 2) as app_download_cost,
+                	round(if(sum(a.click_count) > 0, sum(a.download_start) / sum(a.click_count), 0), 4) as app_download_rate,
+                	sum(a.download_finish) as download_finish,
+                	round(if(sum(a.download_finish) > 0, sum(a.cost) / sum(a.download_finish), 0), 2) as download_finish_cost,
+                	round(if(sum(a.download_start) > 0, sum(a.download_finish) / sum(a.download_start), 0), 4) as download_finish_rate,
+                	sum(a.install_finish) as app_install_count,
+                	round(if(sum(a.install_finish) > 0, sum(a.cost) / sum(a.install_finish), 0), 2) as app_install_cost,
+                	round(if(sum(a.download_finish) > 0, sum(a.install_finish) / sum(a.download_finish), 0), 4) as app_install_rate,
+                	sum(a.active) as app_active_count,
+                	round(if(sum(a.active) > 0, sum(a.cost) / sum(a.active), 0), 2) as app_active_cost,
+                	round(if(sum(a.click_count) > 0, sum(a.active) / sum(a.click_count), 0), 4) as app_active_rate,
+                	sum(a.register_num) as reg_user_count,
+                	round(if(sum(a.register_num) > 0, sum(a.cost) / sum(a.register_num), 0), 2) as reg_cost,
+                	sum(a.first_new_user_amount_count) as first_user_recharge_count,
+                	sum(a.first_new_user_amount_num) as first_user_recharge_user,
+                	sum(a.first_new_user_amount) as first_user_recharge_money,
+                	sum(a.first_new_user_amount_count) as user_recharge_count,
+                	sum(a.first_new_user_amount_num) as user_recharge_user,
+                	sum(a.first_new_user_amount) as user_recharge_money,
+                	sum(a.old_amount_count) as old_user_recharge_count,
+                	sum(a.old_amount_num) as old_user_recharge_user,
+                	sum(a.old_amount) as old_user_recharge_money,
+                	sum(a.new_user_total_amount_count) as new_user_recharge_count,
+                	sum(a.new_user_total_amount_num) as new_user_recharge_user,
+                	sum(a.new_user_total_amount) as new_user_recharge_money,
+                	round(if(sum(a.cost) > 0, sum(a.first_new_user_amount) / sum(a.cost), 0), 4) as first_recovery_rate,
+                	round(if(sum(a.cost) > 0, sum(a.new_user_total_amount) / sum(a.cost), 0), 4) as today_recovery_rate,
+                	sum(a.gross_profit) as gross_margin,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_d3, '/', 1)) / sum(a.cost), 0), 4) as roi_day3,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_d5, '/', 1)) / sum(a.cost), 0), 4) as roi_day5,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_d7, '/', 1)) / sum(a.cost), 0), 4) as roi_day7,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_d15, '/', 1)) / sum(a.cost), 0), 4) as roi_day15,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_m1, '/', 1)) / sum(a.cost), 0), 4) as roi_day30,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_m2, '/', 1)) / sum(a.cost), 0), 4) as roi_day60,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_m6, '/', 1)) / sum(a.cost), 0), 4) as roi_day180,
+                	round(if(sum(a.cost) > 0, sum(a.SPLIT_PART(a.amount_y1, '/', 1)) / sum(a.cost), 0), 4) as roi_year1,
+                	round(if(sum(a.register_num) > 0, sum(a.first_new_user_amount_num) / sum(a.register_num), 0), 4) as first_recharge_rate,
+                	round(if(sum(a.register_num) > 0, sum(a.new_user_total_amount_num) / sum(a.register_num), 0), 4) as today_recharge_rate,
+                	round(if(sum(a.first_new_user_amount_count) > 0, sum(a.first_new_user_amount) / sum(a.first_new_user_amount_count), 0), 4) as avg_first_user_recharge,
+                	round(if(sum(a.new_user_total_amount_count) > 0, sum(a.new_user_total_amount) / sum(a.new_user_total_amount_count), 0), 4) as avg_today_recharge,
+                	round(if(sum(a.first_new_user_amount_num) > 0, sum(a.cost) / sum(a.first_new_user_amount_num), 0), 2) as first_recharge_cost,
+                	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.cost) / sum(a.new_user_total_amount_num), 0), 2) as today_recharge_cost,
+                	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.reg_order_user_again) / sum(a.new_user_total_amount_num), 0), 4) as today_repeat_recharge_rate,
+                	round(if(sum(a.register_num) > 0, sum(a.new_user_total_amount) / sum(a.register_num), 0), 4) as new_reg_arpu,
+                	round(if(sum(a.first_new_user_amount_num) > 0, sum(a.first_new_user_amount) / sum(a.first_new_user_amount_num), 0), 4) as first_recharge_arpu,
+                	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.new_user_total_amount) / sum(a.new_user_total_amount_num), 0), 4) as today_recharge_arpu,
+                	sum(a.hundred_user_num) as hundred_user_num,
+                	round(if(sum(a.hundred_user_num) > 0, sum(a.cost) / sum(a.hundred_user_num), 0), 2) as hundred_user_num_cost
+                from
+                	ads_account_agent_day a
+                """;
+    }
+
     /**
      * 推广总数据SQL
      * @return
@@ -876,26 +1183,28 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	round(if(sum(a.register_num) > 0, sum(a.new_user_total_amount_num) / sum(a.register_num), 0), 4) as today_recharge_rate,
                 	round(if(sum(a.first_new_user_amount_count) > 0, sum(a.first_new_user_amount) / sum(a.first_new_user_amount_count), 0), 4) as avg_first_user_recharge,
                 	round(if(sum(a.new_user_total_amount_count) > 0, sum(a.new_user_total_amount) / sum(a.new_user_total_amount_count), 0), 4) as avg_today_recharge,
-                	round(if(sum(a.first_new_user_amount_num) > 0, sum(a.cost) / sum(a.first_new_user_amount_num), 0), 4) as first_recharge_cost,
-                	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.cost) / sum(a.new_user_total_amount_num), 0), 4) as today_recharge_cost,
+                	round(if(sum(a.first_new_user_amount_num) > 0, sum(a.cost) / sum(a.first_new_user_amount_num), 0), 2) as first_recharge_cost,
+                	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.cost) / sum(a.new_user_total_amount_num), 0), 2) as today_recharge_cost,
                 	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.reg_order_user_again) / sum(a.new_user_total_amount_num), 0), 4) as today_repeat_recharge_rate,
                 	round(if(sum(a.register_num) > 0, sum(a.new_user_total_amount) / sum(a.register_num), 0), 4) as new_reg_arpu,
                 	round(if(sum(a.first_new_user_amount_num) > 0, sum(a.first_new_user_amount) / sum(a.first_new_user_amount_num), 0), 4) as first_recharge_arpu,
                 	round(if(sum(a.new_user_total_amount_num) > 0, sum(a.new_user_total_amount) / sum(a.new_user_total_amount_num), 0), 4) as today_recharge_arpu,
                 	sum(a.hundred_user_num) as hundred_user_num,
-                	round(if(sum(a.hundred_user_num) > 0, sum(a.cost) / sum(a.hundred_user_num), 0), 4) as hundred_user_num_cost
+                	round(if(sum(a.hundred_user_num) > 0, sum(a.cost) / sum(a.hundred_user_num), 0), 2) as hundred_user_num_cost
                 from
                 	ads_account_agent_day a
                 """;
     }
 
     @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
     @Builder
     public static class DayN{
-        private BigDecimal rechargeMoney;
-        private Long rechargeCount;
-        private Long rechargeNum;
-        private Long repeatNum;
+        private BigDecimal rechargeMoney = BigDecimal.ZERO;
+        private Long rechargeCount = 0L;
+        private Long rechargeNum = 0L;
+        private Long repeatNum = 0L;
     }
 
     @Data
@@ -913,4 +1222,16 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
 
         private BigDecimal showRechargeArpu;
     }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class AgentAccount{
+        private String sourceSystem;
+
+        private Long accountId;
+
+        private Long agentId;
+    }
 }