소스 검색

feat : bug调试修改

bilingfeng 2 년 전
부모
커밋
0ab151de36

+ 44 - 0
game-module/game-common/src/main/java/com/zanxiang/common/enums/GameStatusEnum.java

@@ -0,0 +1,44 @@
+package com.zanxiang.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-11-15
+ * @description : 游戏状态
+ */
+@Getter
+@AllArgsConstructor
+public enum GameStatusEnum {
+
+    /**
+     * 未接入
+     */
+    UN_JOIN_UP(1, "未接入"),
+
+    /**
+     * 接入中
+     */
+    NOW_JOIN_UP(2, "接入中"),
+
+    /**
+     * 上线
+     */
+    ON_LINE(3, "上线"),
+
+    /**
+     * 下线
+     */
+    OFF_LINE(4, "下线");
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 描述
+     */
+    private String name;
+}

+ 3 - 3
game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/GameListParam.java

@@ -64,8 +64,8 @@ public class GameListParam extends BasePage<Game> {
     private Boolean isParentClassify;
 
     /**
-     * 上线状态1 接入中, 2 可上线, 3 已下线
+     * 上线状态 1 : 未接入, 2 : 接入中, 3 : 上线, 4 : 下线
      */
-    @ApiModelProperty(notes = "上线状态1 接入中, 2 可上线, 3 已下线")
-    private Integer status;
+    @ApiModelProperty(notes = "上线状态 1 : 未接入, 2 : 接入中, 3 : 上线, 4 : 下线")
+    private String status;
 }

+ 1 - 0
game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/AllGamePayWayByGameIdVO.java

@@ -9,6 +9,7 @@ import lombok.Data;
  */
 @Data
 public class AllGamePayWayByGameIdVO {
+
     @ApiModelProperty(notes = "微信支付配置")
     private GameWxpayPayVO wxpayPayVO;
 

+ 4 - 3
game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.GameCategoryEnum;
+import com.zanxiang.common.enums.GameStatusEnum;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.dto.GameCategoryDTO;
 import com.zanxiang.manage.domain.dto.GameDTO;
@@ -335,7 +336,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements Ga
                     .classifyParent(map.get("classifyParent"))
                     .cpPaybackUrl(param.getCpPaybackUrl())
                     .gameUrl(param.getGameUrl())
-                    .status(1)
+                    .status(GameStatusEnum.UN_JOIN_UP.getStatus())
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
                     .build();
@@ -411,11 +412,11 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements Ga
                 .eq(param.getGameCategoryId() != null, Game::getCategory, param.getGameCategoryId())
                 .eq(param.getH5GameId() != null, Game::getH5GameId, param.getH5GameId())
                 .eq(param.getGuideGameId() != null, Game::getGuideGameId, param.getGuideGameId())
+                .eq(Strings.isNotBlank(param.getStatus()), Game::getStatus, param.getStatus())
                 .apply(param.getGameClassifyId() != null && !Objects.equals(param.getIsParentClassify(), Boolean.TRUE),
                         "FIND_IN_SET({0}, classify)", String.valueOf(param.getGameClassifyId()))
                 .apply(param.getGameClassifyId() != null && Objects.equals(param.getIsParentClassify(), Boolean.TRUE),
-                        "FIND_IN_SET({0}, classifyParent)", String.valueOf(param.getGameClassifyId()))
-                .eq(param.getStatus() != null, Game::getStatus, param.getStatus())
+                        "FIND_IN_SET({0}, classify_parent)", String.valueOf(param.getGameClassifyId()))
                 .orderByDesc(Game::getCreateTime)
         ).convert(game -> this.toVo(game, cpMap, gameCategoryMap, gameMap));
     }

+ 1 - 1
game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Game.java

@@ -83,7 +83,7 @@ public class Game {
     private String packageName;
 
     /**
-     * 上线状态1 接入中, 2 可上线, 3 已下线
+     * 上线状态 1 : 未接入, 2 : 接入中, 3 : 上线, 4 : 下线
      */
     private Integer status;