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

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

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt", "agentId", "accountId", "sourceSystem"})
+@PK({"dt", "agentId", "accountId", "sourceSystem", "pitcherId", "gameId"})
 public class AdsOverallSummaryAgent implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_overall_summary_agent";
@@ -53,13 +53,11 @@ public class AdsOverallSummaryAgent implements Serializable {
     /**
      * 投手ID
      */
-    @Column
     private Long pitcherId;
 
     /**
      * 游戏ID
      */
-    @Column
     private Long gameId;
 
     /**

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

@@ -26,7 +26,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt", "agentId", "accountId", "sourceSystem"})
+@PK({"dt", "agentId", "accountId", "sourceSystem", "pitcherId", "gameId"})
 public class AdsOverallSummaryAmount implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_overall_summary_amount";
@@ -54,13 +54,11 @@ public class AdsOverallSummaryAmount implements Serializable {
     /**
      * 投手ID
      */
-    @Column
     private Long pitcherId;
 
     /**
      * 游戏ID
      */
-    @Column
     private Long gameId;
 
     /**

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

@@ -26,7 +26,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt", "agentId", "accountId", "sourceSystem"})
+@PK({"dt", "agentId", "accountId", "sourceSystem", "pitcherId", "gameId"})
 public class AdsOverallSummaryCost implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_overall_summary_cost";
@@ -54,13 +54,11 @@ public class AdsOverallSummaryCost implements Serializable {
     /**
      * 投手ID
      */
-    @Column
     private Long pitcherId;
 
     /**
      * 游戏ID
      */
-    @Column
     private Long gameId;
 
     /**

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

@@ -4,7 +4,6 @@ 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;
 
@@ -25,7 +24,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt", "agentId", "pitcherId", "accountId", "sourceSystem"})
+@PK({"dt", "agentId", "pitcherId", "accountId", "sourceSystem", "pitcherId", "gameId", "gameName"})
 public class AdsOverallSummaryGame implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_overall_summary_game";
@@ -58,19 +57,16 @@ public class AdsOverallSummaryGame implements Serializable {
     /**
      * 投手名字
      */
-    @Column
     private Long pitcherName;
 
     /**
      * 游戏ID
      */
-    @Column
     private Long gameId;
 
     /**
      * 游戏名称
      */
-    @Column
     private Long gameName;
 
 }

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

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt", "agentId", "accountId", "sourceSystem"})
+@PK({"dt", "agentId", "accountId", "sourceSystem", "pitcherId", "gameId"})
 public class AdsOverallSummaryUser implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_overall_summary_user";
@@ -53,13 +53,11 @@ public class AdsOverallSummaryUser implements Serializable {
     /**
      * 投手ID
      */
-    @Column
     private Long pitcherId;
 
     /**
      * 游戏ID
      */
-    @Column
     private Long gameId;
 
     /**

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

@@ -785,7 +785,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	round(if(sum(cost) > 0, sum(SPLIT_PART(amount_y1, '/', 1)) / sum(cost), 0), 4) as roi_year1,
                 	round(if(sum(register_num) > 0, sum(first_new_user_amount_num) / sum(register_num), 0), 4) as first_recharge_rate,
                 	round(if(sum(register_num) > 0, sum(buy_new_user_total_amount_num) / sum(register_num), 0), 4) as buy_user_recharge_rate,
-                	round(if(sum(register_num) > 0, sum(new_user_total_amount_num) / sum(register_num), 0), 4) as new_user_recharge_rate,
+                	round(if(sum(register_num) > 0, sum(first_new_user_amount_num) / sum(amount_num), 0), 4) as new_user_recharge_rate,
                 	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,

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, SDK后台功能修改优化> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, SDK后台组长权限修改> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/AgentServiceImpl.java

@@ -217,6 +217,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         //渠道列表
         List<Agent> agentList;
         List<AgentDTO> agentDTOList = new ArrayList<>();
+        boolean groupLeader = false;
         //超管权限
         if (SecurityUtil.isManager()) {
             agentList = super.list(new LambdaQueryWrapper<Agent>()
@@ -228,6 +229,10 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
             List<Long> memberUserIdList = sysUserGroupRpc.memberUserId(SecurityUtil.getCompanyId(), SecurityUtil.getUserId()).getData();
             //组长, 可查看自己或者组员数据
             if (CollectionUtils.isNotEmpty(memberUserIdList)) {
+                groupLeader = true;
+                if (!memberUserIdList.contains(SecurityUtil.getUserId())) {
+                    memberUserIdList.add(SecurityUtil.getUserId());
+                }
                 agentList = super.list(new LambdaQueryWrapper<Agent>()
                         .eq(Strings.isNotBlank(account), Agent::getAccountId, account)
                         .eq(Strings.isNotBlank(pitcherId), Agent::getCreateBy, pitcherId)
@@ -261,6 +266,10 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         if (SecurityUtil.isManager() && Strings.isBlank(account) && Strings.isBlank(pitcherId) && agentId == null) {
             agentIds.add(Agent.DEFAULT_AGENT);
         }
+        //组长可见自然量
+        if (groupLeader && !agentIds.contains(Agent.DEFAULT_AGENT)) {
+            agentIds.add(Agent.DEFAULT_AGENT);
+        }
         return Tuples.of(agentIds, agentDTOList);
     }