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

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

@@ -793,4 +793,70 @@ public class PromotionDayTotalVO {
     @ApiModelProperty(value = "15日:ROI/付费/倍数")
     private PromotionRechargeTrendVO d15Trend;
 
+    /**
+     * 注册人数 (应用下载广告数据-激活数)
+     */
+    @ApiModelProperty(value = "注册人数 (应用下载广告数据-激活数)")
+    private Long active;
+
+    /**
+     * 注册成本 (应用下载广告数据-激活成本)
+     */
+    @ApiModelProperty(value = "注册成本 (应用下载广告数据-激活成本)")
+    private BigDecimal activeCost;
+
+    /**
+     * 首日转化数 (转化数据-转化数)
+     */
+    @ApiModelProperty(value = "首日转化数 (转化数据-转化数)")
+    private Long firstConvertCount;
+
+    /**
+     * 首日转化成本 (转化数据-转化成本)
+     */
+    @ApiModelProperty(value = "首日转化成本 (转化数据-转化成本)")
+    private BigDecimal firstConvertCost;
+
+    /**
+     * 首次付费率 (应用下载广告数据-首次付费率)
+     */
+    @ApiModelProperty(value = "首次付费率 (应用下载广告数据-首次付费率)")
+    private BigDecimal firstActivePayRate;
+
+    /**
+     * 首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)
+     */
+    @ApiModelProperty(value = "首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)")
+    private BigDecimal firstAttributionGameInAppLtv1day;
+
+    /**
+     * 首日付费ROI (当日付费ROI)
+     */
+    @ApiModelProperty(value = "首日付费ROI (当日付费ROI)")
+    private BigDecimal firstAttributionGameInAppRoi1day;
+
+    /**
+     * 付费次数 (应用下载广告数据-付费次数)
+     */
+    @ApiModelProperty(value = "付费次数 (应用下载广告数据-付费次数)")
+    private Long gamePayCount;
+
+    /**
+     * ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）
+     */
+    @ApiModelProperty(value = "ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）")
+    private BigDecimal ltvDay1;
+
+    /**
+     * 每日扣单数 （广告首日总订单数 - 应用下载广告数据-付费次数（game_pay_count））
+     */
+    @ApiModelProperty(value = "每日扣单数 （广告首日总订单数 - 应用下载广告数据-付费次数（game_pay_count））")
+    private Long subOrderNum;
+
+    /**
+     * 每日扣单金额  （广告首日总金额 - 当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额（attribution_game_in_app_ltv1day） ）
+     */
+    @ApiModelProperty(value = "每日扣单金额  （广告首日总金额 - 当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额（attribution_game_in_app_ltv1day） ）")
+    private BigDecimal subOrderAmount;
+
 }

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

@@ -299,7 +299,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                         vo.getD2().divide(vo.getTodayCost(), 4, RoundingMode.HALF_UP))
                 .rechargeMoney(vo.getD2())
                 .multiples(vo.getD1().compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO :
-                        vo.getD2().divide(vo.getD1(), 4, RoundingMode.HALF_UP))
+                        vo.getD2().divide(vo.getD1(), 2, RoundingMode.HALF_UP))
                 .build());
         //计算d3数据
         vo.setD3Trend(PromotionRechargeTrendVO.builder()
@@ -307,7 +307,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                         vo.getD3().divide(vo.getTodayCost(), 4, RoundingMode.HALF_UP))
                 .rechargeMoney(vo.getD3())
                 .multiples(vo.getD1().compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO :
-                        vo.getD3().divide(vo.getD1(), 4, RoundingMode.HALF_UP))
+                        vo.getD3().divide(vo.getD1(), 2, RoundingMode.HALF_UP))
                 .build());
         //计算d7数据
         vo.setD7Trend(PromotionRechargeTrendVO.builder()
@@ -315,7 +315,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                         vo.getD7().divide(vo.getTodayCost(), 4, RoundingMode.HALF_UP))
                 .rechargeMoney(vo.getD7())
                 .multiples(vo.getD1().compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO :
-                        vo.getD7().divide(vo.getD1(), 4, RoundingMode.HALF_UP))
+                        vo.getD7().divide(vo.getD1(), 2, RoundingMode.HALF_UP))
                 .build());
         //计算d15数据
         vo.setD15Trend(PromotionRechargeTrendVO.builder()
@@ -323,7 +323,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                         vo.getD15().divide(vo.getTodayCost(), 4, RoundingMode.HALF_UP))
                 .rechargeMoney(vo.getD15())
                 .multiples(vo.getD1().compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO :
-                        vo.getD15().divide(vo.getD1(), 4, RoundingMode.HALF_UP))
+                        vo.getD15().divide(vo.getD1(), 2, RoundingMode.HALF_UP))
                 .build());
 
         return vo;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <数据库关键字段修改, 新增日志12> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <数据库关键字段修改, 修正导量用户id不正确的问题> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
+import com.zanxiang.game.module.mybatis.entity.Game;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserCard;
@@ -16,10 +17,7 @@ import com.zanxiang.game.module.sdk.pojo.param.UpdatePasswordParam;
 import com.zanxiang.game.module.sdk.pojo.param.UserData;
 import com.zanxiang.game.module.sdk.pojo.vo.CustomerVO;
 import com.zanxiang.game.module.sdk.pojo.vo.UserVO;
-import com.zanxiang.game.module.sdk.service.IGameExtService;
-import com.zanxiang.game.module.sdk.service.ISmsService;
-import com.zanxiang.game.module.sdk.service.IUserCardService;
-import com.zanxiang.game.module.sdk.service.IUserService;
+import com.zanxiang.game.module.sdk.service.*;
 import com.zanxiang.game.module.sdk.util.RegisterUtil;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
@@ -52,6 +50,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private IUserCardService userCardService;
 
+    @Autowired
+    private IGameService gameService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultVO<Boolean> findPassword(FindPasswordParam param, UserData userData) {
@@ -190,6 +191,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .checkSwitch(gameExt.getCheckSwitch())
                 .token(userData.getToken())
                 .build();
+        //判断用户是否为导量H5用户, 修正用户id
+        Game game = gameService.getById(user.getGameId());
+        if (user.getRelationUserId() != null && game.getGuideGameId() != null) {
+            userVO.setUserId(user.getRelationUserId());
+        }
         log.error("获取用户详情返回用户信息, userVO : {}", JsonUtil.toString(userVO));
         return userVO;
     }