Merge branch 'dev' of GameCenter/game-center into master

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

@@ -63,27 +63,24 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
             } else {
                 GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
                 doBack = BackPolicyUtil.backOrder(orderLog.getOrderNo(), gameBackPolicy, orderLog.getAmount(),
-                        () -> {
-                            return count(new LambdaQueryWrapper<GameOceanengineOrderLog>()
-                                    .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
-                                    .eq(GameOceanengineOrderLog::getAppId, orderLog.getAppId())
-                                    .eq(GameOceanengineOrderLog::getAccountId, orderLog.getAccountId())
-                                    .eq(GameOceanengineOrderLog::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
-                                    .eq(GameOceanengineOrderLog::getOpenId, orderLog.getOpenId())
-                                    .last("limit 1")
-                            ) < 1;
-                        },
-                        backUnit -> {
-                            return Long.valueOf(list(new LambdaQueryWrapper<GameOceanengineOrderLog>()
-                                            .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
-                                            .eq(GameOceanengineOrderLog::getAppId, orderLog.getAppId())
-                                            .eq(GameOceanengineOrderLog::getAccountId, orderLog.getAccountId())
-                                            .eq(GameOceanengineOrderLog::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
-                                            .orderByDesc(GameOceanengineOrderLog::getCreateTime)
-                                            .last("limit " + backUnit)
-                                    ).stream().filter(log -> log.getOrderStatus().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
-                            ).intValue();
-                        });
+                        () -> count(new LambdaQueryWrapper<GameOceanengineOrderLog>()
+                                .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
+                                .eq(GameOceanengineOrderLog::getAppId, orderLog.getAppId())
+                                .eq(GameOceanengineOrderLog::getAccountId, orderLog.getAccountId())
+                                .eq(GameOceanengineOrderLog::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
+                                .eq(GameOceanengineOrderLog::getOpenId, orderLog.getOpenId())
+                                .last("limit 1")
+                        ) < 1,
+                        backUnit -> Long.valueOf(list(new LambdaQueryWrapper<GameOceanengineOrderLog>()
+                                        .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
+                                        .eq(GameOceanengineOrderLog::getAppId, orderLog.getAppId())
+                                        .eq(GameOceanengineOrderLog::getAccountId, orderLog.getAccountId())
+                                        .eq(GameOceanengineOrderLog::getBackPolicyId, gameBackPolicy.getId())
+                                        .eq(GameOceanengineOrderLog::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
+                                        .orderByDesc(GameOceanengineOrderLog::getCreateTime)
+                                        .last("limit " + backUnit)
+                                ).stream().filter(log -> log.getBackStatus().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
+                        ).intValue());
                 orderLog.setAmount(BackPolicyUtil.lowRechargeLevel(orderLog.getAmount(), gameBackPolicy.getLevelDown()));
             }
         }

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

@@ -47,6 +47,10 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean orderBack(GameTencentMiniGameOrder orderLog, boolean mustBack) {
+        if (StringUtils.isBlank(orderLog.getClickId())) {
+            // 没有点击 id（之后做监测链接，从监测链接里面找）
+            return false;
+        }
         boolean doBack = false;
         if (mustBack) {
             doBack = true;
@@ -55,33 +59,31 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
                 // 只要回传 支付行为
                 return false;
             }
-        }
-        if (StringUtils.isBlank(orderLog.getClickId())) {
-            // 没有点击 id（之后做监测链接，从监测链接里面找）
-            return false;
-        }
-        if (orderLog.getBackPolicyId() == null) {
-            // 没有回传策略，则直接全量回传
-            doBack = true;
-        } else {
-            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
-            doBack = BackPolicyUtil.backOrder(orderLog.getOrderId(), gameBackPolicy, orderLog.getRechargeMoney(),
-                    () -> count(new LambdaQueryWrapper<GameTencentMiniGameOrder>()
-                            .eq(GameTencentMiniGameOrder::getGameId, orderLog.getGameId())
-                            .eq(GameTencentMiniGameOrder::getWechatAppId, orderLog.getWechatAppId())
-                            .eq(GameTencentMiniGameOrder::getAdAccountId, orderLog.getAdAccountId())
-                            .eq(GameTencentMiniGameOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
-                            .eq(GameTencentMiniGameOrder::getWechatOpenid, orderLog.getWechatOpenid())
-                            .last("limit 1")
-                    ) < 1, backUnit -> Long.valueOf(count(new LambdaQueryWrapper<GameTencentMiniGameOrder>()
-                            .eq(GameTencentMiniGameOrder::getGameId, orderLog.getGameId())
-                            .eq(GameTencentMiniGameOrder::getWechatAppId, orderLog.getWechatAppId())
-                            .eq(GameTencentMiniGameOrder::getAdAccountId, orderLog.getAdAccountId())
-                            .eq(GameTencentMiniGameOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
-                            .orderByDesc(GameTencentMiniGameOrder::getCreateTime)
-                            .last("limit " + backUnit)
-                    )).intValue());
-            orderLog.setRechargeMoney(BackPolicyUtil.lowRechargeLevel(orderLog.getRechargeMoney(), gameBackPolicy.getLevelDown()));
+            if (orderLog.getBackPolicyId() == null) {
+                // 没有回传策略，则直接全量回传
+                doBack = true;
+            } else {
+                GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
+                doBack = BackPolicyUtil.backOrder(orderLog.getOrderId(), gameBackPolicy, orderLog.getRechargeMoney(),
+                        () -> count(new LambdaQueryWrapper<GameTencentMiniGameOrder>()
+                                .eq(GameTencentMiniGameOrder::getGameId, orderLog.getGameId())
+                                .eq(GameTencentMiniGameOrder::getWechatAppId, orderLog.getWechatAppId())
+                                .eq(GameTencentMiniGameOrder::getAdAccountId, orderLog.getAdAccountId())
+                                .eq(GameTencentMiniGameOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
+                                .eq(GameTencentMiniGameOrder::getWechatOpenid, orderLog.getWechatOpenid())
+                                .last("limit 1")
+                        ) < 1, backUnit -> Long.valueOf(list(new LambdaQueryWrapper<GameTencentMiniGameOrder>()
+                                        .eq(GameTencentMiniGameOrder::getGameId, orderLog.getGameId())
+                                        .eq(GameTencentMiniGameOrder::getWechatAppId, orderLog.getWechatAppId())
+                                        .eq(GameTencentMiniGameOrder::getAdAccountId, orderLog.getAdAccountId())
+                                        .eq(GameTencentMiniGameOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
+                                        .eq(GameTencentMiniGameOrder::getBackPolicyId, gameBackPolicy.getId())
+                                        .orderByDesc(GameTencentMiniGameOrder::getCreateTime)
+                                        .last("limit " + backUnit)
+                                ).stream().filter(log -> log.getBackStatus().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
+                        ).intValue());
+                orderLog.setRechargeMoney(BackPolicyUtil.lowRechargeLevel(orderLog.getRechargeMoney(), gameBackPolicy.getLevelDown()));
+            }
         }
         if (doBack) {
             BackStatusEnum backStatus = gameTencentMiniGameBackLogService.orderBack(orderLog);

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

@@ -69,29 +69,31 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                 // 只要回传 支付行为
                 return false;
             }
-        }
-        if (orderLog.getBackPolicyId() == null) {
-            // 没有回传策略，则直接全量回传
-            doBack = true;
-        } else {
-            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
-            doBack = BackPolicyUtil.backOrder(orderLog.getOrderId(), gameBackPolicy, orderLog.getRechargeMoney(),
-                    () -> count(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::getWechatOpenid, orderLog.getWechatOpenid())
-                            .last("limit 1")
-                    ) < 1, backUnit -> Long.valueOf(count(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())
-                            .orderByDesc(GameTencentOrder::getCreateTime)
-                            .last("limit " + backUnit)
-                    )).intValue());
-            orderLog.setRechargeMoney(BackPolicyUtil.lowRechargeLevel(orderLog.getRechargeMoney(), gameBackPolicy.getLevelDown()));
+            if (orderLog.getBackPolicyId() == null) {
+                // 没有回传策略，则直接全量回传
+                doBack = true;
+            } else {
+                GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
+                doBack = BackPolicyUtil.backOrder(orderLog.getOrderId(), gameBackPolicy, orderLog.getRechargeMoney(),
+                        () -> count(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::getWechatOpenid, orderLog.getWechatOpenid())
+                                .last("limit 1")
+                        ) < 1, backUnit -> Long.valueOf(list(new LambdaQueryWrapper<GameTencentOrder>()
+                                        .eq(GameTencentOrder::getGameId, orderLog.getGameId())
+                                        .eq(GameTencentOrder::getWechatAppId, orderLog.getWechatAppId())
+                                        .eq(GameTencentOrder::getAdAccountId, orderLog.getAdAccountId())
+                                        .eq(GameTencentOrder::getBackPolicyId, gameBackPolicy.getId())
+                                        .eq(GameTencentOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
+                                        .orderByDesc(GameTencentOrder::getCreateTime)
+                                        .last("limit " + backUnit)
+                                ).stream().filter(log -> log.getIsBack().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
+                        ).intValue());
+                orderLog.setRechargeMoney(BackPolicyUtil.lowRechargeLevel(orderLog.getRechargeMoney(), gameBackPolicy.getLevelDown()));
+            }
         }
         if (doBack) {
             BackStatusEnum backStatus = doCallback(orderLog);

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

@@ -91,7 +91,7 @@ public class BackPolicyUtil {
             return isBackCount < backCount;
         } else if (Objects.equals(backType, GameBackPolicy.POLICY_TYPE_RANDOM_RATE)) {
             // 随机概率回传
-            boolean isBack = RandomUtils.nextInt(0, 100) <= NumberUtil.multiply100(new BigDecimal(backRate)).intValue();
+            boolean isBack = RandomUtils.nextInt(0, 100) < NumberUtil.multiply100(new BigDecimal(backRate)).intValue();
             log.error("订单 id[{}]通过回传策略[{}]判断后，是否回传：{}.", orderId, gameBackPolicy.getId(), isBack);
             return isBack;
         } else {

game-back/game-back-serve/src/main/resources/logback.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="false" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="${user.home}/logs"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+    :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.zanxiang" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+
+</configuration>

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

@@ -0,0 +1,38 @@
+package com.zanxiang.game.data.serve.controller;
+
+import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.game.data.serve.pojo.dto.AdsAccountRechargeRankingListDTO;
+import com.zanxiang.game.data.serve.pojo.vo.AdsAccountRechargeRankingVO;
+import com.zanxiang.game.data.serve.pojo.vo.AdsAgentRechargeRankingVO;
+import com.zanxiang.game.data.serve.service.IAdsAccountRechargeRankingService;
+import com.zanxiang.game.data.serve.utils.Page;
+import com.zanxiang.module.util.pojo.ResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Api(tags = {"账号充值排行榜"})
+@RestController
+@RequestMapping("/accountRechargeRanking")
+public class AdsAccountRechargeRankingController {
+
+    @Autowired
+    private IAdsAccountRechargeRankingService adsAccountRechargeRankingService;
+
+    @PreAuthorize(permissionKey = "gameData:accountRechargeRanking:list")
+    @ApiOperation(value = "推广账号充值排行榜")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AdsAgentRechargeRankingVO.class)})
+    @PostMapping("/list")
+    public ResultVO<Page<AdsAccountRechargeRankingVO>> list(@Validated @RequestBody AdsAccountRechargeRankingListDTO dto) {
+        return ResultVO.ok(adsAccountRechargeRankingService.listOfPage(dto));
+    }
+}

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

@@ -1,4 +1,37 @@
 package com.zanxiang.game.data.serve.controller;
 
+import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.game.data.serve.pojo.dto.AdsAgentRechargeRankingListDTO;
+import com.zanxiang.game.data.serve.pojo.vo.AdsAgentRechargeRankingVO;
+import com.zanxiang.game.data.serve.service.IAdsAgentRechargeRankingService;
+import com.zanxiang.game.data.serve.utils.Page;
+import com.zanxiang.module.util.pojo.ResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Api(tags = {"渠道充值排行榜"})
+@RestController
+@RequestMapping("/agentRechargeRanking")
 public class AdsAgentRechargeRankingController {
+
+    @Autowired
+    private IAdsAgentRechargeRankingService adsAgentRechargeRankingService;
+
+    @PreAuthorize(permissionKey = "gameData:agentRechargeRanking:list")
+    @ApiOperation(value = "推广渠道充值排行榜")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AdsAgentRechargeRankingVO.class)})
+    @PostMapping("/list")
+    public ResultVO<Page<AdsAgentRechargeRankingVO>> list(@Validated @RequestBody AdsAgentRechargeRankingListDTO dto) {
+        return ResultVO.ok(adsAgentRechargeRankingService.listOfPage(dto));
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.zanxiang.game.data.serve.pojo.dto;
+
+import com.zanxiang.game.data.serve.pojo.base.BasePage;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class AdsAccountRechargeRankingListDTO  extends BasePage {
+
+    private LocalDate beginDay;
+
+    private LocalDate endDay;
+
+    private String accountId;
+
+    private String pitcherId;
+
+    private String type;
+
+    private String gameId;
+
+    private String sortFiled;
+
+    private String sortType;
+}

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

@@ -8,11 +8,17 @@ import java.time.LocalDate;
 @Data
 public class AdsAgentRechargeRankingListDTO extends BasePage {
 
-    private LocalDate beginTime;
+    private LocalDate beginDay;
 
-    private LocalDate endTime;
+    private LocalDate endDay;
 
     private String agentId;
 
     private String pitcherId;
+
+    private String type;
+
+    private String sortFiled;
+
+    private String sortType;
 }

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

@@ -52,6 +52,12 @@ public class AdsAccountRechargeRanking implements Serializable {
     @Column
     private String pitcher;
 
+    @Column
+    private String pitcherId;
+
+    @Column
+    private String gameId;
+
     /**
      * 推广游戏名称
      */

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

@@ -0,0 +1,91 @@
+package com.zanxiang.game.data.serve.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AdsAccountRechargeRankingVO {
+
+    @ApiModelProperty(notes = "序号")
+    private Integer index;
+
+    @ApiModelProperty(notes = "推广账号")
+    private Long accountId;
+
+    @ApiModelProperty(notes = "推广账号媒体")
+    private String type;
+
+    @ApiModelProperty(notes = "投手名称")
+    private String pitcher;
+
+    @ApiModelProperty(notes = "游戏 id")
+    private String gameId;
+
+    @ApiModelProperty(notes = "推广游戏名称")
+    private String gameName;
+
+    @ApiModelProperty(notes = "推广游戏类型")
+    private String gameClassify;
+
+    @ApiModelProperty(notes = "推广游戏CP名称")
+    private String gameCp;
+
+    @ApiModelProperty(notes = "消耗")
+    private BigDecimal cost;
+
+    @ApiModelProperty(notes = "推广广告数量")
+    private Long adCount;
+
+    @ApiModelProperty(notes = "曝光数量")
+    private Long viewCount;
+
+    @ApiModelProperty(notes = "点击数量")
+    private Long clickCount;
+
+    @ApiModelProperty(notes = "点击率")
+    private BigDecimal clickRate;
+
+    @ApiModelProperty(notes = "千次曝光成本")
+    private BigDecimal thousandDisplayPrice;
+
+    @ApiModelProperty(notes = "注册人数")
+    private Long regUserCnt;
+
+    @ApiModelProperty(notes = "注册成本")
+    private BigDecimal regCost;
+
+    @ApiModelProperty(notes = "首日创角人数")
+    private Long firstRole;
+
+    @ApiModelProperty(notes = "累计创角人数")
+    private Long totalRole;
+
+    @ApiModelProperty(notes = "首日充值金额")
+    private BigDecimal firstAmount;
+
+    @ApiModelProperty(notes = "首日充值人数")
+    private Long firstAmountUser;
+
+    @ApiModelProperty(notes = "首日充值次数")
+    private Long firstAmountCount;
+
+    @ApiModelProperty(notes = "累计充值金额")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty(notes = "累计充值人数")
+    private Long totalAmountUser;
+
+    @ApiModelProperty(notes = "累计充值次数")
+    private Long totalAmountCount;
+
+    @ApiModelProperty(notes = "首日ROI")
+    private BigDecimal firstRoi;
+
+    @ApiModelProperty(notes = "平均单价")
+    private BigDecimal avgAmount;
+
+    @ApiModelProperty(notes = "回本率")
+    private BigDecimal roi;
+}

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

@@ -2,88 +2,48 @@ package com.zanxiang.game.data.serve.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.nutz.dao.entity.annotation.Column;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 @Data
 public class AdsAgentRechargeRankingVO {
 
-    /**
-     * 日期（充值时间）
-     */
-    @ApiModelProperty(notes = "日期（充值时间）")
-    private LocalDate dt;
+    @ApiModelProperty(notes = "序号")
+    private Integer index;
 
-    /**
-     * 推广渠道账号
-     */
+    @ApiModelProperty(notes = "推广渠道账号")
     private Long agentId;
 
-    /**
-     * 推广渠道名称
-     */
-    @Column
+    @ApiModelProperty(notes = "推广渠道名称")
     private String agentName;
 
-    /**
-     * 投手
-     */
-    @Column
+    @ApiModelProperty(notes = "投手")
     private String pitcher;
 
-    /**
-     * 推广媒体
-     */
-    @Column
+    @ApiModelProperty(notes = "推广媒体")
     private String type;
 
-    /**
-     * 当天充值金额
-     */
-    @Column
+    @ApiModelProperty(notes = "当天充值金额")
     private BigDecimal todayAmount;
 
-    /**
-     * 累计充值今额
-     */
-    @Column
+    @ApiModelProperty(notes = "累计充值今额")
     private BigDecimal totalAmount;
 
-    /**
-     * 累计充值人数
-     */
-    @Column
+    @ApiModelProperty(notes = "累计充值人数")
     private Long totalRechargeUserCount;
 
-    /**
-     * 累计充值次数
-     */
-    @Column
+    @ApiModelProperty(notes = "累计充值次数")
     private Long totalRechargeCount;
 
-    /**
-     * 平均单价
-     */
-    @Column
+    @ApiModelProperty(notes = "平均单价")
     private BigDecimal avgAmount;
 
-    /**
-     * 注册人数
-     */
-    @Column
+    @ApiModelProperty(notes = "注册人数")
     private Long regUserCount;
 
-    /**
-     * 累计消耗
-     */
-    @Column
+    @ApiModelProperty(notes = "累计消耗")
     private BigDecimal totalCost;
 
-    /**
-     * 回本率
-     */
-    @Column
+    @ApiModelProperty(notes = "回本率")
     private BigDecimal roi;
 }

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

@@ -0,0 +1,10 @@
+package com.zanxiang.game.data.serve.service;
+
+import com.zanxiang.game.data.serve.pojo.dto.AdsAccountRechargeRankingListDTO;
+import com.zanxiang.game.data.serve.pojo.vo.AdsAccountRechargeRankingVO;
+import com.zanxiang.game.data.serve.utils.Page;
+
+public interface IAdsAccountRechargeRankingService {
+
+    Page<AdsAccountRechargeRankingVO> listOfPage(AdsAccountRechargeRankingListDTO dto);
+}

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

@@ -1,4 +1,10 @@
 package com.zanxiang.game.data.serve.service;
 
+import com.zanxiang.game.data.serve.pojo.dto.AdsAgentRechargeRankingListDTO;
+import com.zanxiang.game.data.serve.pojo.vo.AdsAgentRechargeRankingVO;
+import com.zanxiang.game.data.serve.utils.Page;
+
 public interface IAdsAgentRechargeRankingService {
+
+    Page<AdsAgentRechargeRankingVO> listOfPage(AdsAgentRechargeRankingListDTO dto);
 }

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

@@ -196,6 +196,10 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         Long sysUserId = SecurityUtil.isAdmin() ? null : SecurityUtil.getUserId();
         sysUserId = null == dto.getSysUserId() ? sysUserId : dto.getSysUserId();
         dto.setSysUserId(sysUserId);
+        if (null == dto.getBeginDay() || null == dto.getEndDay()){
+            dto.setBeginDay(LocalDate.now());
+            dto.setEndDay(LocalDate.now());
+        }
         // 创建一个 Criteria 接口实例
         SimpleCriteria cri = Cnd.cri();
         // 组装条件

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

@@ -0,0 +1,99 @@
+package com.zanxiang.game.data.serve.service.impl;
+
+import com.google.common.base.CaseFormat;
+import com.zanxiang.erp.security.util.SecurityUtil;
+import com.zanxiang.game.data.serve.pojo.dto.AdsAccountRechargeRankingListDTO;
+import com.zanxiang.game.data.serve.pojo.entity.AdsAccountRechargeRanking;
+import com.zanxiang.game.data.serve.pojo.vo.AdsAccountRechargeRankingVO;
+import com.zanxiang.game.data.serve.service.IAdsAccountRechargeRankingService;
+import com.zanxiang.game.data.serve.utils.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.entity.Entity;
+import org.nutz.dao.pager.Pager;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.Daos;
+import org.nutz.dao.util.cri.SimpleCriteria;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class AdsAccountRechargeRankingServiceImpl implements IAdsAccountRechargeRankingService {
+
+    @Autowired
+    private Dao dao;
+
+    @Override
+    public Page<AdsAccountRechargeRankingVO> listOfPage(AdsAccountRechargeRankingListDTO dto) {
+        if (StringUtils.isBlank(dto.getPitcherId()) && !SecurityUtil.isManager()) {
+            dto.setPitcherId(SecurityUtil.getUserId().toString());
+        }
+        Pager pager = dto.toPage();
+        String sqlStr = """
+                select account_id, pitcher_id, max(pitcher) as pitcher, `type`, game_id, max(game_name), max(game_classify) as game_classify , max(game_cp) as game_cp,
+                sum(cost) as cost,
+                sum(ad_count) as ad_count,
+                sum(view_count) as view_count,
+                sum(click_count) as click_count,
+                sum(click_count) / sum(view_count) as click_rate,
+                if(sum(view_count) > 0, sum(cost)/sum(view_count) * 1000, '--') as thousand_display_price,
+                sum(reg_user_cnt) as reg_user_cnt,
+                sum(cost) / sum(reg_user_cnt) as reg_cost,
+                sum(first_role) as first_role,
+                sum(total_role) as total_role,
+                sum(first_amount) as first_amount,
+                sum(first_amount_user) as first_amount_user,
+                sum(first_amount_count) as first_amount_count,
+                sum(total_amount) as total_amount,
+                sum(total_amount_user) as total_amount_user,
+                sum(total_amount_count) as total_amount_count,
+                sum(cost) / sum(first_amount) as first_roi,
+                sum(total_amount) / sum(total_amount_count) as avg_amount,
+                sum(total_amount) / sum(cost) as roi
+                from ads_account_recharge_ranking
+                """;
+        SimpleCriteria cri = Cnd.cri();
+        if (null != dto.getBeginDay() && null != dto.getEndDay()) {
+            cri.where().and(AdsAccountRechargeRanking::getDt, ">=", dto.getBeginDay()).and(AdsAccountRechargeRanking::getDt, "<=", dto.getEndDay());
+        }
+        if (StringUtils.isNotBlank(dto.getPitcherId())) {
+            cri.where().and(AdsAccountRechargeRanking::getPitcherId, "=", dto.getPitcherId());
+        }
+        if(StringUtils.isNotBlank(dto.getAccountId())) {
+            cri.where().and(AdsAccountRechargeRanking::getAccountId, "=", dto.getAccountId());
+        }
+        if(StringUtils.isNotBlank(dto.getGameId())) {
+            cri.where().and(AdsAccountRechargeRanking::getGameId, "=", dto.getGameId());
+        }
+        if (StringUtils.isNotBlank(dto.getType())) {
+            cri.where().and(AdsAccountRechargeRanking::getType, "=", dto.getType());
+        }
+        cri.groupBy(AdsAccountRechargeRanking::getAccountId, AdsAccountRechargeRanking::getPitcherId, AdsAccountRechargeRanking::getType, AdsAccountRechargeRanking::getGameId);
+        cri.orderBy(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, dto.getSortFiled()), dto.getSortType());
+        Sql sql = Sqls.queryEntity(sqlStr + "$condition");
+        sql.setPager(pager);
+
+        Entity<AdsAccountRechargeRankingVO> entity = dao.getEntity(AdsAccountRechargeRankingVO.class);
+        sql.setEntity(entity).setCondition(cri);
+        dao.execute(sql);
+
+
+        Sql pagerSql = Sqls.queryEntity("select count(*) from ads_agent_recharge_ranking " + "$condition");
+        pagerSql.setCondition(cri);
+        pager.setRecordCount(((Long) Daos.queryCount(dao, pagerSql)).intValue());
+
+        List<AdsAccountRechargeRankingVO> result = sql.getList(AdsAccountRechargeRankingVO.class);
+        int beginIndex = (dto.getPageNum() - 1) * dto.getPageSize();
+        int size = result.size();
+        while (--size >= 0) {
+            result.get(size).setIndex(beginIndex + size);
+        }
+        return new Page<>(result, pager);
+    }
+}

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

@@ -1,17 +1,27 @@
 package com.zanxiang.game.data.serve.service.impl;
 
+import com.google.common.base.CaseFormat;
+import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.data.serve.pojo.dto.AdsAgentRechargeRankingListDTO;
 import com.zanxiang.game.data.serve.pojo.entity.AdsAgentRechargeRanking;
 import com.zanxiang.game.data.serve.pojo.vo.AdsAgentRechargeRankingVO;
 import com.zanxiang.game.data.serve.service.IAdsAgentRechargeRankingService;
 import com.zanxiang.game.data.serve.utils.Page;
-import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.entity.Entity;
 import org.nutz.dao.pager.Pager;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.Daos;
+import org.nutz.dao.util.cri.SimpleCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Slf4j
 @Service
 public class AdsAgentRechargeRankingServiceImpl implements IAdsAgentRechargeRankingService {
@@ -19,19 +29,55 @@ public class AdsAgentRechargeRankingServiceImpl implements IAdsAgentRechargeRank
     @Autowired
     private Dao dao;
 
-    private Page<AdsAgentRechargeRankingVO> list(AdsAgentRechargeRankingListDTO dto) {
+    public Page<AdsAgentRechargeRankingVO> listOfPage(AdsAgentRechargeRankingListDTO dto) {
+        if (StringUtils.isBlank(dto.getPitcherId()) && !SecurityUtil.isManager()) {
+            dto.setPitcherId(SecurityUtil.getUserId().toString());
+        }
         Pager pager = dto.toPage();
-        String sql = """
-                select * from ads_agent_recharge_ranking
-                group by 
+        String sqlStr = """
+                select agent_id, max(agent_name) as agent_name, pitcher_id, max(pitcher) as pitcher, `type`,
+                sum(today_amount) as today_amount,
+                sum(new_user_total_recharge_amount) as new_user_total_recharge_amount,
+                sum(new_user_total_recharge_num) as new_user_total_recharge_num,
+                sum(new_user_total_recharge_count) as new_user_total_recharge_count,
+                sum(total_cost) as total_cost,
+                sum(new_user_total_recharge_amount) / sum(new_user_total_recharge_count) as avg_amount,
+                if (sum(total_cost) > 0, sum(new_user_total_recharge_amount) / sum(total_cost), 'xx') as roi
+                from ads_agent_recharge_ranking
                 """;
-        return null;
-    }
+        SimpleCriteria cri = Cnd.cri();
+        if (null != dto.getBeginDay() && null != dto.getEndDay()) {
+            cri.where().and(AdsAgentRechargeRanking::getDt, ">=", dto.getBeginDay()).and(AdsAgentRechargeRanking::getDt, "<=", dto.getEndDay());
+        }
+        if (StringUtils.isNotBlank(dto.getAgentId())) {
+            cri.where().and(AdsAgentRechargeRanking::getAgentId, "=", dto.getAgentId());
+        }
+        if (StringUtils.isNotBlank(dto.getPitcherId())) {
+            cri.where().and(AdsAgentRechargeRanking::getPitcherId, "=", dto.getPitcherId());
+        }
+        if (StringUtils.isNotBlank(dto.getType())) {
+            cri.where().and(AdsAgentRechargeRanking::getType, "=", dto.getType());
+        }
+        cri.groupBy(AdsAgentRechargeRanking::getAgentId, AdsAgentRechargeRanking::getPitcherId, AdsAgentRechargeRanking::getType);
+        cri.orderBy(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, dto.getSortFiled()), dto.getSortType());
+        Sql sql = Sqls.queryEntity(sqlStr + "$condition");
+        sql.setPager(pager);
+
+        Entity<AdsAgentRechargeRankingVO> entity = dao.getEntity(AdsAgentRechargeRankingVO.class);
+        sql.setEntity(entity).setCondition(cri);
+        dao.execute(sql);
+
+
+        Sql pagerSql = Sqls.queryEntity("select count(*) from ads_agent_recharge_ranking " + "$condition");
+        pagerSql.setCondition(cri);
+        pager.setRecordCount(((Long) Daos.queryCount(dao, pagerSql)).intValue());
 
-    private AdsAgentRechargeRankingVO toVO(AdsAgentRechargeRanking agentRechargeRanking) {
-        if (agentRechargeRanking == null) {
-            return null;
+        List<AdsAgentRechargeRankingVO> result = sql.getList(AdsAgentRechargeRankingVO.class);
+        int beginIndex = (dto.getPageNum() - 1) * dto.getPageSize();
+        int size = result.size();
+        while (--size >= 0) {
+            result.get(size).setIndex(beginIndex + size);
         }
-        return BeanUtil.copy(agentRechargeRanking, AdsAgentRechargeRankingVO.class);
+        return new Page<>(result, pager);
     }
 }