diff --git a/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixInnerUser.java b/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixInnerUser.java index 72f1334..cc46a6f 100644 --- a/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixInnerUser.java +++ b/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixInnerUser.java @@ -12,6 +12,7 @@ public class MatrixInnerUser { private Integer id; private Integer userId; private Integer appId; + private Integer status; private Timestamp createdAt; private Timestamp updatedAt; } diff --git a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixInnerUserMapper.java b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixInnerUserMapper.java index b97e84d..e107ea3 100644 --- a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixInnerUserMapper.java +++ b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixInnerUserMapper.java @@ -3,6 +3,7 @@ package awesome.group.game.dao.mapper; import awesome.group.game.dao.bean.MatrixInnerUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -10,6 +11,9 @@ public interface MatrixInnerUserMapper extends BaseMapper { @Select("select * from matrix_inner_user where user_id = #{userId}") MatrixInnerUser queryByUserId(Integer userId); - @Select("Select user_id from matrix_inner_user where app_id = #{appId}") + @Select("Select user_id from matrix_inner_user where app_id = #{appId} and status = 0") List queryByAppId(Integer appId); + + @Update("update matrix_inner_user set status = #{status} where user_id = #{userId}") + int updateStatus(Integer userId, int status); } diff --git a/game-service/src/main/java/awesome/group/game/service/bo/matrix/WhiteUserBo.java b/game-service/src/main/java/awesome/group/game/service/bo/matrix/WhiteUserBo.java index 03403c3..ba087da 100644 --- a/game-service/src/main/java/awesome/group/game/service/bo/matrix/WhiteUserBo.java +++ b/game-service/src/main/java/awesome/group/game/service/bo/matrix/WhiteUserBo.java @@ -33,6 +33,7 @@ public class WhiteUserBo { this.id = w.getId(); this.appId = u.getAppId(); this.appName = a.getName(); + this.status = w.getStatus(); this.user = new UserBo(u, true); this.createdAt = w.getCreatedAt().getTime(); this.updatedAt = w.getUpdatedAt().getTime(); diff --git a/game-service/src/main/java/awesome/group/game/service/matrix/SuperAdminService.java b/game-service/src/main/java/awesome/group/game/service/matrix/SuperAdminService.java index 084764b..d3b57ae 100644 --- a/game-service/src/main/java/awesome/group/game/service/matrix/SuperAdminService.java +++ b/game-service/src/main/java/awesome/group/game/service/matrix/SuperAdminService.java @@ -123,6 +123,10 @@ public class SuperAdminService { } } + public void changeInnerUser(Integer userId, int status) { + innerUserMapper.updateStatus(userId, status); + } + public void saveInnerUser(Integer userId) { if (innerUserMapper.queryByUserId(userId) != null) { return; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/SuperAdminController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/SuperAdminController.java index 132b047..1bfd84a 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/SuperAdminController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/SuperAdminController.java @@ -1,7 +1,6 @@ package awesome.group.game.web.rest.matrix; import awesome.group.game.dao.bean.MatrixEvilApp; -import awesome.group.game.dao.bean.MatrixMockSchedule; import awesome.group.game.dao.bean.MatrixMockScheduleV2; import awesome.group.game.service.bo.AddMockScheduleReq; import awesome.group.game.service.bo.matrix.WhiteUserBo; @@ -10,7 +9,6 @@ import awesome.group.game.service.matrix.SuperAdminService; import awesome.group.game.service.pay.AlipayFundTransUniTransfer; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; -import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -68,6 +66,13 @@ public class SuperAdminController { return new R<>(null); } + @PostMapping("/changeInnerUserStatus") + @RestApi + public R changeInnerUserStatus(@RequestParam Integer userId, @RequestParam int status) { + superAdminService.changeInnerUser(userId, status); + return new R<>(null); + } + @PostMapping("/transfer") @RestApi public R transfer(@RequestParam String name, @RequestParam String aliAccount, @RequestParam String appCode) {