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

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

@@ -979,4 +979,16 @@ public class TencentPromotionDayTotalVO {
     @ApiModelProperty(value = "每日扣单金额  （广告首日总金额 - 当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额（attribution_game_in_app_ltv1day） ）")
     private BigDecimal subOrderAmount;
 
+    /**
+     * 是否删除 1：是 ； 0 否
+     */
+    @ApiModelProperty(value = "是否已删除 1：是 ； 0 否")
+    private Long isDeleted;
+
+    /**
+     * 客户设置的状态
+     */
+    @ApiModelProperty(value = "客户设置的状态")
+    private String configuredStatus;
+
 }

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

@@ -1153,5 +1153,17 @@ public class TencentPromotionDayVO {
      */
     @ApiModelProperty(value = "每日扣单金额  （广告首日总金额 - 当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额（attribution_game_in_app_ltv1day） ）")
     private BigDecimal subOrderAmount;
-    
+
+    /**
+     * 是否删除 1：是 ； 0 否
+     */
+    @ApiModelProperty(value = "是否已删除 1：是 ； 0 否")
+    private Long isDeleted;
+
+    /**
+     * 客户设置的状态
+     */
+    @ApiModelProperty(value = "客户设置的状态")
+    private String configuredStatus;
+
 }

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

@@ -1334,6 +1334,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     notes,
                     service,
                     balance,
+                    is_deleted,
+                	configured_status,
                     promotion_total_cost,
                     convert_target,
                     reg_total_num,
@@ -1486,6 +1488,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 		MAX(game_id) as game_id,
                 		MAX(game_name) as game_name,
                 		MAX(classify) as classify,
+                		MAX(is_deleted) as is_deleted,
+                		MAX(configured_status) as configured_status,
                 		SUM(today_cost) as today_cost,
                 		SUM(show_count) as show_count,
                 		round(if(SUM(show_count) > 0, SUM(today_cost) * 1000 / SUM(show_count), 0), 2) as thousand_display_price,

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服务启动成功 <用户注册加线程锁, token活跃更新> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <壳包控制兼容多版本测试> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -16,6 +16,7 @@ import com.zanxiang.game.module.sdk.service.IGameUserRoleService;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -71,6 +72,10 @@ public class GameAppletShellServiceImpl extends ServiceImpl<GameAppletShellMappe
         if (Objects.equals(gameAppletShell.getTestVersion(), version)) {
             return ShellSwitchEnum.SHELL_SWITCH_CLOSE.getShellSwitch();
         }
+        //测试版本, 关闭壳包, 兼容需要多个版本的情况
+        if (Strings.isNotBlank(gameAppletShell.getTestVersion()) && gameAppletShell.getTestVersion().contains(version)) {
+            return ShellSwitchEnum.SHELL_SWITCH_CLOSE.getShellSwitch();
+        }
         //兜底逻辑,  找不到版本号直接返回进入壳包
         log.error("版本信息不存在, 默认进壳包, appId : {}, version : {}", appId, version);
         return ShellSwitchEnum.SHELL_SWITCH_OPEN.getShellSwitch();