游戏头条广告添加7日字段

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

@@ -1077,48 +1077,48 @@ public class PromotionDayVO {
      * 七日人均付费次数（广告）
      */
     @ApiModelProperty("七日人均付费次数（广告）")
-    private Long attribution_active_pay7d_per_count;
+    private Long attributionActivePay7dPerCount;
 
     /**
      * 七日付费成本（广告）
      */
     @ApiModelProperty("七日付费成本（广告）")
-    private BigDecimal attribution_game_pay7d_cost;
+    private BigDecimal attributionGamePay7dCost;
 
     /**
      * 七日付费次数
      */
     @ApiModelProperty("七日付费次数")
-    private Long day7_amount_count;
+    private Long day7AmountCount;
 
     /**
      * 七日付费成本
      */
     @ApiModelProperty("七日付费成本")
-    private BigDecimal day7_amount_per_cost;
+    private BigDecimal day7AmountPerCost;
 
     /**
      * 七日人均付费次数
      */
     @ApiModelProperty("七日人均付费次数")
-    private Long day7_amount_per_count;
+    private Long day7AmountPerCount;
 
     /**
      * 7日ARPU
      */
     @ApiModelProperty("7日ARPU")
-    private BigDecimal day7_arpu;
+    private BigDecimal day7Arpu;
 
     /**
      * 七日付费人数
      */
     @ApiModelProperty("七日付费人数")
-    private Long day7_amount_num;
+    private Long day7AmountNum;
 
     /**
      * 七日付费金额
      */
     @ApiModelProperty("七日付费金额")
-    private BigDecimal day7_amount;
+    private BigDecimal day7Amount;
     
 }

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

@@ -55,12 +55,9 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
      * @return
      */
     public Page<PromotionDayVO> getPromotionDayListData(PromotionDayDTO dto) {
-//        Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
-//        List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(dto.getPitcherId());
-//        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : Collections.singletonList(dto.getGameId());
-
-        List<Long> userIds = dto.getPitcherId() == null ? null : Collections.singletonList(dto.getPitcherId());
-        List<Long> gameIds = dto.getGameId() == null ? null : Collections.singletonList(dto.getGameId());
+        Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
+        List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(dto.getPitcherId());
+        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : Collections.singletonList(dto.getGameId());
 
         //如果没有排序条件给默认值
         if (StringUtils.isBlank(dto.getSortFiled())) {
@@ -146,12 +143,9 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
      */
     @Override
     public Page<PromotionDayVO> getPromotionDayData(PromotionDayDTO dto) {
-//        Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
-//        List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(dto.getPitcherId());
-//        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : Collections.singletonList(dto.getGameId());
-
-        List<Long> userIds = dto.getPitcherId() == null ? null : Collections.singletonList(dto.getPitcherId());
-        List<Long> gameIds = dto.getGameId() == null ? null : Collections.singletonList(dto.getGameId());
+        Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
+        List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(dto.getPitcherId());
+        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : Collections.singletonList(dto.getGameId());
 
         //如果没有排序条件给默认值
         if (StringUtils.isBlank(dto.getSortFiled())) {
@@ -233,12 +227,9 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
      */
     @Override
     public PromotionDayTotalVO getPromotionDayTotalData(PromotionDayTotalDTO dto) {
-//        Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
-//        List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(dto.getPitcherId());
-//        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : Collections.singletonList(dto.getGameId());
-
-        List<Long> userIds = dto.getPitcherId() == null ? null : Collections.singletonList(dto.getPitcherId());
-        List<Long> gameIds = dto.getGameId() == null ? null : Collections.singletonList(dto.getGameId());
+        Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
+        List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(dto.getPitcherId());
+        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : Collections.singletonList(dto.getGameId());
 
         //创建查询条件
         Criteria cri = Cnd.cri();