feat: 江南体育中心用户管理

api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserAddReq.java

@@ -0,0 +1,40 @@
+package com.xiang.app.module.jntyzx.pojo.req;
+
+import lombok.Data;
+import org.checkerframework.checker.units.qual.N;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class UserAddReq {
+
+    /**
+     * 用户名称
+     */
+    @NotBlank(message = "用户名称不能为空")
+    private String name;
+    /**
+     * token
+     */
+    @NotBlank(message = "token不能为空")
+    private String token;
+    /**
+     * wx openId
+     */
+    @NotBlank(message = "openId不能为空")
+    private String openId;
+
+    /**
+     * 会员卡号
+     */
+    @NotBlank(message = "会员卡号不能为空")
+    private String memberCardNo;
+
+    /**
+     * 状态 0:禁用 1:启用
+     */
+    @NotNull(message = "用户状态不能为空")
+    private Integer status;
+}
+

api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserStatusUpdateReq.java

@@ -0,0 +1,22 @@
+package com.xiang.app.module.jntyzx.pojo.req;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class UserStatusUpdateReq {
+
+    /**
+     * 用户名称
+     */
+    @NotBlank(message = "用户名称不能为空")
+    private String username;
+
+    /**
+     * status
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+}

api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserTokenUpdateReq.java

@@ -0,0 +1,21 @@
+package com.xiang.app.module.jntyzx.pojo.req;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class UserTokenUpdateReq {
+
+    /**
+     * 用户名称
+     */
+    @NotBlank(message = "用户名称不能为空")
+    private String username;
+
+    /**
+     * token
+     */
+    @NotBlank(message = "token不能为空")
+    private String token;
+}

api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UsernameReq.java

@@ -0,0 +1,11 @@
+package com.xiang.app.module.jntyzx.pojo.req;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class UsernameReq {
+    @NotBlank(message = "用户名称不能为空")
+    private String username;
+}

api/src/main/java/com/xiang/app/module/jntyzx/pojo/resp/JtUserVo.java

@@ -13,6 +13,8 @@ import java.time.LocalDateTime;
 @Data
 public class JtUserVo {
 
+    private Long userId;
+
     /**
      * 用户名称
      */
@@ -51,7 +53,9 @@ public class JtUserVo {
     /**
      * 封禁结束时间
      */
-    private String restrictionDeadline;
+    @DateTimeFormat(pattern = "yyyy-MM-dd Hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd Hh:mm:ss")
+    private LocalDateTime restrictionDeadline;
     /**
      * 封禁缘由
      */

xservice-core/pom.xml

@@ -17,4 +17,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.xiang.app</groupId>
+            <artifactId>api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/converts/UserConverter.java

@@ -0,0 +1,18 @@
+package com.xiang.app.modules.jntyzx.converts;
+
+import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
+import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface UserConverter {
+
+    UserConverter INSTANCE = Mappers.getMapper(UserConverter.class);
+    @Mapping(source = "id", target = "userId")
+    JtUserVo convert(UserTokenInfoDO userTokenInfoDO);
+    List<JtUserVo> convert(List<UserTokenInfoDO> userTokenInfoDOs);
+}

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/pojo/UserTokenInfoDO.java

@@ -54,4 +54,6 @@ public class UserTokenInfoDO {
      */
     @TableField("is_restriction")
     private Integer isRestriction;
+
+    private LocalDateTime updateTime;
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/manage/IUserRestrictionManage.java

@@ -3,7 +3,11 @@ package com.xiang.app.modules.jntyzx.manage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
 
+import java.util.List;
+
 public interface IUserRestrictionManage extends IService<UserRestrictionInfo> {
 
     UserRestrictionInfo queryByUserId(Long userId);
+
+    List<UserRestrictionInfo> queryByIdList(List<Long> idList);
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/manage/IUserTokenInfoManage.java

@@ -1,6 +1,8 @@
 package com.xiang.app.modules.jntyzx.manage;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
+import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 
 import java.util.List;
@@ -15,4 +17,5 @@ public interface IUserTokenInfoManage extends IService<UserTokenInfoDO>  {
 
     List<UserTokenInfoDO> listCanOrder();
 
+    List<UserTokenInfoDO> queryByList(UserQueryReq req);
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/manage/UserRestrictionManageImpl.java

@@ -7,6 +7,8 @@ import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
 import com.xiang.app.modules.jntyzx.mapper.JntyzxUserRestrictionInfoMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class UserRestrictionManageImpl extends ServiceImpl<JntyzxUserRestrictionInfoMapper, UserRestrictionInfo> implements IUserRestrictionManage {
     @Override
@@ -15,4 +17,11 @@ public class UserRestrictionManageImpl extends ServiceImpl<JntyzxUserRestriction
         lambdaQueryWrapper.eq(UserRestrictionInfo::getUserId, userId);
         return  baseMapper.selectOne(lambdaQueryWrapper);
     }
+
+    @Override
+    public List<UserRestrictionInfo> queryByIdList(List<Long> idList) {
+        LambdaQueryWrapper<UserRestrictionInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.in(UserRestrictionInfo::getUserId, idList);
+        return  baseMapper.selectList(lambdaQueryWrapper);
+    }
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/manage/UserTokenInfoManageImpl.java

@@ -1,13 +1,16 @@
 package com.xiang.app.modules.jntyzx.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 import com.xiang.app.modules.jntyzx.mapper.JntyzxUserTokenInfoMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Author: xiang
@@ -27,6 +30,7 @@ public class UserTokenInfoManageImpl extends ServiceImpl<JntyzxUserTokenInfoMapp
         LambdaQueryWrapper<UserTokenInfoDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(UserTokenInfoDO::getStatus, 1);
         lambdaQueryWrapper.eq(UserTokenInfoDO::getName, name);
+        lambdaQueryWrapper.last("limit 1");
         return baseMapper.selectOne(lambdaQueryWrapper);
     }
 
@@ -38,4 +42,28 @@ public class UserTokenInfoManageImpl extends ServiceImpl<JntyzxUserTokenInfoMapp
         lambdaQueryWrapper.eq(UserTokenInfoDO::getIsRestriction, 0);
         return baseMapper.selectList(lambdaQueryWrapper);
     }
+
+    @Override
+    public List<UserTokenInfoDO> queryByList(UserQueryReq req) {
+        LambdaQueryWrapper<UserTokenInfoDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(req.getName())) {
+            lambdaQueryWrapper.like(UserTokenInfoDO::getName, req.getName());
+        }
+        if (StringUtils.isNotBlank(req.getOpenId())) {
+            lambdaQueryWrapper.eq(UserTokenInfoDO::getOpenId, req.getOpenId());
+        }
+        if (StringUtils.isNotBlank(req.getMemberCardNo())) {
+            lambdaQueryWrapper.eq(UserTokenInfoDO::getMemberCardNo, req.getMemberCardNo());
+        }
+        if (Objects.nonNull(req.getStatus())) {
+            lambdaQueryWrapper.eq(UserTokenInfoDO::getStatus, req.getStatus());
+        }
+        if (Objects.nonNull(req.getIsRestriction())) {
+            lambdaQueryWrapper.eq(UserTokenInfoDO::getIsRestriction, req.getIsRestriction());
+        }
+        if (Objects.nonNull(req.getIsOrder())) {
+            lambdaQueryWrapper.eq(UserTokenInfoDO::getIsOrder, req.getIsOrder());
+        }
+        return baseMapper.selectList(lambdaQueryWrapper);
+    }
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/IUserTokenInfoService.java

@@ -1,7 +1,13 @@
 package com.xiang.app.modules.jntyzx.service;
 
+import com.xiang.app.module.jntyzx.pojo.req.UserAddReq;
+import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
+import com.xiang.app.module.jntyzx.pojo.req.UsernameReq;
+import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -16,4 +22,14 @@ public interface IUserTokenInfoService {
     boolean flushSingleToken(String name);
     boolean flushToken();
     boolean updateTokenByName(String name, String token);
+
+    List<JtUserVo> list(UserQueryReq req);
+
+    Boolean updateStatusByUserName(String username, Integer status);
+
+    Boolean refreshToken(String username);
+
+    Boolean save(UserAddReq req);
+
+    JtUserVo info(Long userId);
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/UserTokenInfoServiceImpl.java

@@ -1,6 +1,12 @@
 package com.xiang.app.modules.jntyzx.service.impl;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.xiang.app.module.jntyzx.pojo.req.UserAddReq;
+import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
+import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
+import com.xiang.app.modules.jntyzx.converts.UserConverter;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 import com.xiang.app.modules.jntyzx.entity.resp.JntyzxResponse;
@@ -9,6 +15,7 @@ import com.xiang.app.modules.jntyzx.manage.IUserRestrictionManage;
 import com.xiang.app.modules.jntyzx.manage.IUserTokenInfoManage;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
+import com.xiang.xservice.basic.exception.BusinessException;
 import com.xiang.xservice.basic.utils.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,8 +23,12 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @Author: xiang
@@ -32,6 +43,7 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
     private final IJntyzxHttpService jntyzxHttpService;
     private final JtDingTalkFactory jtDingTalkFactory;
     private final IUserRestrictionManage userRestrictionManage;
+    private final UserConverter userConverter;
 
 
     @Override
@@ -108,6 +120,97 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
         return flag;
     }
 
+    @Override
+    public List<JtUserVo> list(UserQueryReq req) {
+        List<UserTokenInfoDO> userTokenInfoDOS = userTokenInfoManage.queryByList(req);
+        if (CollectionUtils.isEmpty(userTokenInfoDOS)) {
+            return Lists.newArrayList();
+        }
+        List<Long> idList = userTokenInfoDOS.stream().map(UserTokenInfoDO::getId).toList();
+        List<UserRestrictionInfo> userRestrictionInfos = userRestrictionManage.queryByIdList(idList);
+        Map<Long, UserRestrictionInfo> userRestrictionInfoMap = Maps.newHashMap();
+        if (CollectionUtils.isNotEmpty(userRestrictionInfos)) {
+            userRestrictionInfoMap.putAll(
+                    userRestrictionInfos.stream().collect(Collectors.toMap(
+                            UserRestrictionInfo::getUserId, Function.identity(), (a, b) -> a)));
+        }
+        List<JtUserVo> jtUserVoList = userConverter.convert(userTokenInfoDOS);
+        jtUserVoList.forEach(item -> {
+            if (userRestrictionInfoMap.containsKey(item.getUserId())) {
+                UserRestrictionInfo userRestrictionInfo = userRestrictionInfoMap.get(item.getUserId());
+                if (Objects.nonNull(userRestrictionInfo)) {
+                    if (userRestrictionInfo.getRestrictionDeadline().isAfter(LocalDateTime.now())) {
+                        item.setRestrictionDeadline(userRestrictionInfo.getRestrictionDeadline());
+                        item.setRestrictionDesc(userRestrictionInfo.getRestrictionDesc());
+                    }
+                }
+            }
+        });
+        return jtUserVoList;
+    }
+
+    @Override
+    public Boolean updateStatusByUserName(String username, Integer status) {
+        if (StringUtils.isEmpty(username)) {
+            log.error("用户名为空");
+            return false;
+        }
+        UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(username);
+        if (Objects.isNull(userTokenInfoDO)) {
+            throw new BusinessException("用户不存在！");
+        }
+        userTokenInfoDO.setStatus(status);
+        return userTokenInfoManage.updateById(userTokenInfoDO);
+    }
+
+    @Override
+    public Boolean refreshToken(String username) {
+        if (StringUtils.isEmpty(username)) {
+            log.error("用户名为空");
+            return false;
+        }
+        UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(username);
+        if (Objects.isNull(userTokenInfoDO)) {
+            throw new BusinessException("用户不存在！");
+        }
+        return healthDeclaration(userTokenInfoDO);
+    }
+
+    @Override
+    public Boolean save(UserAddReq req) {
+        UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(req.getName());
+        if (Objects.nonNull(userTokenInfoDO)) {
+            throw new BusinessException("用户名已存在！");
+        }
+        userTokenInfoDO = new UserTokenInfoDO();
+        userTokenInfoDO.setName(req.getName());
+        userTokenInfoDO.setToken(req.getToken());
+        userTokenInfoDO.setOpenId(req.getOpenId());
+        userTokenInfoDO.setStatus(req.getStatus());
+        userTokenInfoDO.setIsOrder(1);
+        userTokenInfoDO.setMemberCardNo(req.getMemberCardNo());
+        userTokenInfoDO.setIsRestriction(0);
+        userTokenInfoDO.setUpdateTime(LocalDateTime.now());
+        return userTokenInfoManage.save(userTokenInfoDO);
+    }
+
+    @Override
+    public JtUserVo info(Long userId) {
+        UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getById(userId);
+        if (Objects.isNull(userTokenInfoDO)) {
+            throw new BusinessException("用户不存在！");
+        }
+        JtUserVo jtUserVo = userConverter.convert(userTokenInfoDO);
+        UserRestrictionInfo userRestrictionInfo = userRestrictionManage.queryByUserId(userId);
+        if (Objects.nonNull(userRestrictionInfo)) {
+            if (userRestrictionInfo.getRestrictionDeadline().isAfter(LocalDateTime.now())) {
+                jtUserVo.setRestrictionDeadline(userRestrictionInfo.getRestrictionDeadline());
+                jtUserVo.setRestrictionDesc(userRestrictionInfo.getRestrictionDesc());
+            }
+        }
+        return jtUserVo;
+    }
+
     /**
      * 查询用户信息
      *

xservice-server/src/main/java/com/xiang/app/server/jntyzx/UserTokenServer.java

@@ -1,15 +1,65 @@
 package com.xiang.app.server.jntyzx;
 
+import com.xiang.app.module.jntyzx.pojo.req.UserAddReq;
+import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
+import com.xiang.app.module.jntyzx.pojo.req.UserStatusUpdateReq;
+import com.xiang.app.module.jntyzx.pojo.req.UserTokenUpdateReq;
+import com.xiang.app.module.jntyzx.pojo.req.UsernameReq;
+import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
+import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
+import com.xiang.xservice.basic.common.resp.Result;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 /**
+ * 江南体育中心用户管理控制器
+ *
  * @Author: xiang
  * @Date: 2026-03-24 16:38
  */
 @RestController
-@RequestMapping("/private/apps/jntyzx/user/")
+@RequestMapping("/private/apps/jntyzx/user")
+@RequiredArgsConstructor
 public class UserTokenServer {
 
-    public Result<>
+    private final IUserTokenInfoService userTokenInfoService;
+
+
+    @PostMapping("/list")
+    public Result<List<JtUserVo>> list(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserQueryReq req) {
+        return Result.data(userTokenInfoService.list(req));
+    }
+    @GetMapping("/info/{id}")
+    public Result<JtUserVo> info(@PathVariable("id") Long userId) {
+        return Result.data(userTokenInfoService.info(userId));
+    }
+
+    @PostMapping("/updateToken")
+    public Result<Boolean> updateToken(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserTokenUpdateReq req) {
+        return Result.data(userTokenInfoService.updateTokenByName(req.getUsername(), req.getToken()));
+    }
+
+    @PostMapping("/updateStatus")
+    public Result<Boolean> updateStatus(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserStatusUpdateReq req) {
+        return Result.data(userTokenInfoService.updateStatusByUserName(req.getUsername(), req.getStatus()));
+    }
+
+    @PostMapping("/refreshToken")
+    public Result<Boolean> refreshToken(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UsernameReq req) {
+        return Result.data(userTokenInfoService.refreshToken(req.getUsername()));
+    }
+
+    @PostMapping("/add")
+    public Result<Boolean> addUser(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserAddReq req) {
+        return Result.data(userTokenInfoService.save(req));
+    }
 }