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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java

@@ -18,7 +18,7 @@ public class GameBackApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameBackApplication.class, args);
-        System.out.println("游戏回传服务启动成功, 修改头条APP回传的问题, bug修改123 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("新增沉默唤起回传和完成新手引导回传 ( ´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

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

@@ -2,10 +2,7 @@ package com.zanxiang.game.back.serve.pojo;
 
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -37,6 +34,8 @@ public class BackPolicyOfSplitLevel {
     @ApiModelProperty("最小回传等级")
     private Long roleLevelMin;
 
+    @ApiModelProperty("新手引导回传条件")
+    private TutorialFinish tutorialFinish;
 
     @Data
     public static class RechargeLevel {

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

@@ -21,6 +21,8 @@ public class BackPolicyOfSumRecharge {
     @ApiModelProperty("最小回传等级")
     private Long roleLevelMin;
 
+    @ApiModelProperty("新手引导回传条件")
+    private TutorialFinish tutorialFinish;
 
     @Data
     public static class RechargeLevel {

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

@@ -2,6 +2,7 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSplitLevel;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSumRecharge;
+import com.zanxiang.game.back.serve.pojo.TutorialFinish;
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,6 +43,9 @@ public class GameBackPolicyDTO implements Serializable {
 
     private BackPolicyOfSumRecharge typeOfSumRecharge;
 
+    @ApiModelProperty("新手引导回传条件")
+    private TutorialFinish tutorialFinish;
+
     @ApiModelProperty("回传类型（1：首单、次单、2：首日、次日）")
     private Integer backUnit;
 

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

@@ -2,6 +2,7 @@ package com.zanxiang.game.back.serve.pojo.vo;
 
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSplitLevel;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSumRecharge;
+import com.zanxiang.game.back.serve.pojo.TutorialFinish;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -40,6 +41,8 @@ public class GameBackPolicyVO implements Serializable {
 
     private BackPolicyOfSumRecharge typeOfSumRecharge;
 
+    private TutorialFinish tutorialFinish;
+
     @ApiModelProperty("回传类型（1：首单、次单、2：首日、次日）")
     private Integer backUnit;
 

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

@@ -11,6 +11,7 @@ import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.back.serve.dao.mapper.GameBackPolicyMapper;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSplitLevel;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSumRecharge;
+import com.zanxiang.game.back.serve.pojo.TutorialFinish;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyListDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
@@ -128,16 +129,19 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
             backPolicy.setSplitStrategy(CollectionUtils.isEmpty(dto.getSplitStrategy()) ? null : JsonUtil.toString(dto.getSplitStrategy()));
             backPolicy.setActiveBackSwitch(dto.getActiveBackSwitch());
             backPolicy.setRoleLevelMin(dto.getRoleLevelMin());
+            backPolicy.setTutorialFinishJson(JsonUtil.toString(dto.getTutorialFinish()));
         } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SUM_RECHARGE)) {
             backPolicy.setTypeOfSumRechargeJson(JsonUtil.toString(dto.getTypeOfSumRecharge()));
             backPolicy.setRegPayIntervalTime(dto.getTypeOfSumRecharge().getRegPayIntervalTime());
             backPolicy.setActiveBackSwitch(dto.getTypeOfSumRecharge().getActiveBackSwitch());
             backPolicy.setRoleLevelMin(dto.getTypeOfSumRecharge().getRoleLevelMin());
+            backPolicy.setTutorialFinishJson(JsonUtil.toString(dto.getTypeOfSumRecharge().getTutorialFinish()));
         } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SPLIT_LEVEL)) {
             backPolicy.setTypeOfSplitLevelJson(JsonUtil.toString(dto.getTypeOfSplitLevel()));
             backPolicy.setRegPayIntervalTime(dto.getTypeOfSplitLevel().getRegPayIntervalTime());
             backPolicy.setActiveBackSwitch(dto.getTypeOfSplitLevel().getActiveBackSwitch());
             backPolicy.setRoleLevelMin(dto.getTypeOfSplitLevel().getRoleLevelMin());
+            backPolicy.setTutorialFinishJson(JsonUtil.toString(dto.getTypeOfSplitLevel().getTutorialFinish()));
         }
         return gameBackPolicyService.save(backPolicy);
     }
@@ -195,16 +199,19 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
             backPolicy.setSplitStrategy(CollectionUtils.isEmpty(dto.getSplitStrategy()) ? null : JsonUtil.toString(dto.getSplitStrategy()));
             backPolicy.setActiveBackSwitch(dto.getActiveBackSwitch());
             backPolicy.setRoleLevelMin(dto.getRoleLevelMin());
+            backPolicy.setTutorialFinishJson(JsonUtil.toString(dto.getTutorialFinish()));
         } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SUM_RECHARGE)) {
             backPolicy.setTypeOfSumRechargeJson(JsonUtil.toString(dto.getTypeOfSumRecharge()));
             backPolicy.setRegPayIntervalTime(dto.getTypeOfSumRecharge().getRegPayIntervalTime());
             backPolicy.setActiveBackSwitch(dto.getTypeOfSumRecharge().getActiveBackSwitch());
             backPolicy.setRoleLevelMin(dto.getTypeOfSumRecharge().getRoleLevelMin());
+            backPolicy.setTutorialFinishJson(JsonUtil.toString(dto.getTypeOfSumRecharge().getTutorialFinish()));
         } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SPLIT_LEVEL)) {
             backPolicy.setTypeOfSplitLevelJson(JsonUtil.toString(dto.getTypeOfSplitLevel()));
             backPolicy.setRegPayIntervalTime(dto.getTypeOfSplitLevel().getRegPayIntervalTime());
             backPolicy.setActiveBackSwitch(dto.getTypeOfSplitLevel().getActiveBackSwitch());
             backPolicy.setRoleLevelMin(dto.getTypeOfSplitLevel().getRoleLevelMin());
+            backPolicy.setTutorialFinishJson(JsonUtil.toString(dto.getTypeOfSplitLevel().getTutorialFinish()));
         }
         return gameBackPolicyService.updateById(backPolicy);
     }
@@ -261,9 +268,11 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
             if (StringUtils.isNotBlank(gameBackPolicy.getSplitStrategy())) {
                 vo.setSplitStrategy((List<GameBackPolicyVO.SplitStrategy>) JsonUtil.toList(gameBackPolicy.getSplitStrategy(), List.class, GameBackPolicyVO.SplitStrategy.class));
             }
+            if (StringUtils.isNotBlank(gameBackPolicy.getTutorialFinishJson())){
+                vo.setTutorialFinish(JsonUtil.toObj(gameBackPolicy.getTutorialFinishJson(), TutorialFinish.class));
+            }
         } else if (Objects.equals(gameBackPolicy.getPolicyType(), GameBackPolicy.TYPE_SUM_RECHARGE)) {
             vo.setTypeOfSumRecharge(JsonUtil.toObj(gameBackPolicy.getTypeOfSumRechargeJson(), BackPolicyOfSumRecharge.class));
-
         } else if (Objects.equals(gameBackPolicy.getPolicyType(), GameBackPolicy.TYPE_SPLIT_LEVEL)) {
             vo.setTypeOfSplitLevel(JsonUtil.toObj(gameBackPolicy.getTypeOfSplitLevelJson(), BackPolicyOfSplitLevel.class));
         } else {