fix : 优化调试修改, SDK切回智能支付方式

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

@@ -171,12 +171,12 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         if (gameListVO.getParentId() != null) {
             Game parentGame = super.getById(gameListVO.getParentId());
             if (parentGame != null) {
-                gameListVO.setIsParentGame(Boolean.TRUE);
+                gameListVO.setIsParentGame(Boolean.FALSE);
                 gameListVO.setParentId(game.getId());
                 gameListVO.setParentName(game.getName());
             }
         } else {
-            gameListVO.setIsParentGame(Boolean.FALSE);
+            gameListVO.setIsParentGame(Boolean.TRUE);
         }
         //h5游戏
         if (gameListVO.getH5GameId() != null) {

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

@@ -114,7 +114,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
         if (SecurityUtil.isAdmin()) {
-            agentIdList.add(0L);
+            agentIdList.add(Agent.DEFAULT_AGENT);
         }
         //玩家条件处理
         Map<Long, UserDTO> userMap = userService.userCondition(param.getUserId(), agentIdList, param.getUserName(),

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Agent.java

@@ -13,6 +13,9 @@ import java.time.LocalDateTime;
 
 /**
  * 投放渠道
+ *
+ * @author bilingfeng
+ * @date 2023/06/21
  */
 @Data
 @NoArgsConstructor
@@ -20,62 +23,90 @@ import java.time.LocalDateTime;
 @Builder
 @TableName("t_agent")
 public class Agent implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
+    public static final Long DEFAULT_AGENT = 0L;
+
     public static final Integer ACCOUNT_TYPE_TENCENT = 1;
     public static final Integer ACCOUNT_TYPE_BYTE = 2;
 
     public static final Integer PUT_STATUS_ING = 1;
     public static final Integer PUT_STATUS_STOP = 2;
 
+    /**
+     * 主键id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
+
     /**
      * 渠道名称
      */
     private String agentName;
+
     /**
      * 渠道唯一标识
      */
     private String agentKey;
+
     /**
      * 推广账号类型（1：腾讯、2：头条）
      */
     private Integer accountType;
+
     /**
      * 账号类型
      */
     private Long accountId;
+
     /**
      * 游戏id
      */
     private Long gameId;
+
     /**
      * 腾讯用户行为数据源 id
      */
     private Long userActionSetId;
+
     /**
      * 回传策略 id
      */
     private Long backPolicyId;
+
     /**
      * 头条回传 token
      */
     private String reportToken;
+
     /**
      * 头条回传 url
      */
     private String reportUrl;
+
     /**
      * 投放状态
      */
     private Integer putStatus;
 
+    /**
+     * 创建时间
+     */
     private LocalDateTime createTime;
 
+    /**
+     * 创建人
+     */
     private Long createBy;
 
+    /**
+     * 更新时间
+     */
     private LocalDateTime updateTime;
 
+    /**
+     * 更新者
+     */
     private Long updateBy;
 }

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

@@ -104,24 +104,11 @@ public class OrderPayServiceImpl implements IOrderPayService {
 
     @Override
     public Long getAppletPayDevice(UserData userData) {
-
         log.error("获取支付类型参数, 请求信息 userData : {}", JsonUtil.toString(userData));
-
-        //todo : 小游戏为了方便CP调试, 直接全部返回米大师支付
         //查询游戏配置的支付方式
         List<GamePayWayDTO> gamePayWayList = gamePayWayService.listOfGameId(userData.getGameId());
-
         //支付方式
         GamePayWayDTO gamePayWayDTO = null;
-
-        gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->
-                Objects.equals(gamePayWay.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId()))
-                .findFirst().orElse(null);
-        if (gamePayWayDTO != null) {
-            return gamePayWayDTO.getPayDeviceId();
-        }
-
-
         //android用户, 游戏适配米大师支付
         if (Objects.equals(userData.getDeviceSystem(), DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDescribe())) {
             gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->