perf:新增日志

pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xmc-common</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>com.xiang.starter</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xmc-http-starter</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.xiang.starter</groupId>
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xservice-quartz-core</artifactId>
-            <version>1.1</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xmc-logger-starter</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
     </dependencies>
 

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/constants/RedisKeyConstant.java

@@ -1,5 +1,9 @@
 package com.xiang.app.modules.jntyzx.constants;
 
+import com.xiang.xservice.basic.utils.DateUtils;
+
+import java.time.LocalDate;
+
 /**
  * @Author: xiang
  * @Date: 2025-12-16 10:43
@@ -9,4 +13,11 @@ public class RedisKeyConstant {
     public static final String JNTYZX_ORDER_CREATE_KEY = "jntyzx:order:create:orderId:";
 
     public static final String JNTUZX_ORDER_PEEK_KEY = "jntyzx:order:peek:user:";
+
+    public static final String JNTYZX_VENUE_MSG_SEND_KEY = "jntyzx:order:venue:msg:send";
+
+    public static String getDate() {
+        LocalDate now = LocalDate.now();
+        return ":" + DateUtils.getDateFromDate(now);
+    }
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/constants/UrlConstant.java

@@ -15,6 +15,9 @@ public class UrlConstant {
      * 查询当天的场地信息
      */
     public final static String QUERY_TODAY_SUBSCRIBE_URL = GNTYZX_BASE_URL + "/GYM-JN/multi/Subscribe/getSubscribeByToday";
+    /**
+     * 查询明天场地信息
+     */
     public final static String QUERY_TOMORROW_SUBSCRIBE_URL = GNTYZX_BASE_URL + "/GYM-JN/multi/Subscribe/getSubscribeByTomorrow";
 
     /**
@@ -32,4 +35,13 @@ public class UrlConstant {
      */
     public final static String HEALTH_DECLARATION = GNTYZX_BASE_URL + "/GYM-JN//busi/healthDeclaration/addUserPrivacy";
 
+    /**
+     * 校验会员卡状态
+     */
+    public final static String CHECK_NUM = GNTYZX_BASE_URL + "/GYM-JN/multi/Subscribe/checkDefaultsNum";
+
+    /**
+     * 根据openId查询会员卡信息
+     */
+    public final static String QUERY_BY_OPEN_ID = GNTYZX_BASE_URL + "/GYM-JN/multi/xfConsumer/queryByOpenId";
 }

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

@@ -0,0 +1,29 @@
+package com.xiang.app.modules.jntyzx.entity.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("jntyzx_user_restriction")
+public class UserRestrictionInfo {
+
+    private Long id;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 封禁截止时间
+     */
+    private LocalDateTime restrictionDeadline;
+    /**
+     * 封禁原因
+     */
+    private String restrictionDesc;
+}

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

@@ -1,10 +1,13 @@
 package com.xiang.app.modules.jntyzx.entity.pojo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 /**
  * @Author: xiang
  * @Date: 2025-12-16 09:18
@@ -34,4 +37,21 @@ public class UserTokenInfoDO {
      * 状态(0:禁用 1:启用)
      */
     private Integer status;
+
+    /**
+     * 是否可以下单 （0：否 1：是）
+     */
+    private Integer isOrder;
+
+    /**
+     * 会员卡号
+     */
+    @TableField("member_card_no")
+    private String memberCardNo;
+
+    /**
+     * 是否封禁 0：否 1:是
+     */
+    @TableField("is_restriction")
+    private Integer isRestriction;
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/resp/query/UserInfoResponse.java

@@ -0,0 +1,109 @@
+package com.xiang.app.modules.jntyzx.entity.resp.query;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserInfoResponse {
+
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 会员卡号
+     */
+    private String consCard;
+    /**
+     * 姓名
+     */
+    private String consName;
+    /**
+     * 性别
+     */
+    private String consSex;
+    /**
+     * 身份证号
+     */
+    private String consIdCard;
+    /**
+     * 固定电话
+     */
+    private String consTel;
+    /**
+     * 手机号码
+     */
+    private String consHandSet;
+    /**
+     * 单位
+     */
+    private String consUnit;
+    /**
+     * 照片
+     */
+    private String consPhoto;
+    private Integer consWaste;
+    /**
+     * 会员卡号
+     */
+    private String consNumber;
+    private BigDecimal consMin;
+    private Integer consProp;
+    /**
+     * 注册年
+     */
+    private String consYear;
+    /**
+     * 注册月
+     */
+    private String consMonth;
+    /**
+     * 注册日
+     */
+    private String consDay;
+    private boolean consIflag;
+    /**
+     * 注册时间
+     */
+    private LocalDateTime consTimes;
+    /**
+     * openId
+     */
+    private String openId;
+    /**
+     * 头像
+     */
+    private String photoUrl;
+    /**
+     * 会员
+     */
+    private Integer consVip;
+    /**
+     * 会员等级号
+     */
+    private String consVipCode;
+
+    private String eleCardNum;
+    private Integer appointmentEligibility;
+    /**
+     * 封禁截止日期
+     */
+    @JSONField(name = "restrictionDeadline")
+    private String restrictionDeadline;
+    /**
+     * 封禁原因
+     */
+    private String restrictionDescription;
+    /**
+     * 封禁截止日期
+     */
+    @JSONField(name = "RestrictionDeadline")
+    private String RestrictionDeadline2;
+}

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

@@ -0,0 +1,9 @@
+package com.xiang.app.modules.jntyzx.manage;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
+
+public interface IUserRestrictionManage extends IService<UserRestrictionInfo> {
+
+    UserRestrictionInfo queryByUserId(Long userId);
+}

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

@@ -10,7 +10,9 @@ import java.util.List;
  * @Date: 2025-12-16 09:19
  */
 public interface IUserTokenInfoManage extends IService<UserTokenInfoDO>  {
-
     List<UserTokenInfoDO> listUser();
     UserTokenInfoDO getByName(String name);
+
+    List<UserTokenInfoDO> listCanOrder();
+
 }

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

@@ -0,0 +1,18 @@
+package com.xiang.app.modules.jntyzx.manage;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
+import com.xiang.app.modules.jntyzx.mapper.JntyzxUserRestrictionInfoMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserRestrictionManageImpl extends ServiceImpl<JntyzxUserRestrictionInfoMapper, UserRestrictionInfo> implements IUserRestrictionManage {
+    @Override
+    public UserRestrictionInfo queryByUserId(Long userId) {
+        LambdaQueryWrapper<UserRestrictionInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(UserRestrictionInfo::getUserId, userId);
+        return  baseMapper.selectOne(lambdaQueryWrapper);
+    }
+}

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

@@ -29,4 +29,13 @@ public class UserTokenInfoManageImpl extends ServiceImpl<JntyzxUserTokenInfoMapp
         lambdaQueryWrapper.eq(UserTokenInfoDO::getName, name);
         return baseMapper.selectOne(lambdaQueryWrapper);
     }
+
+    @Override
+    public List<UserTokenInfoDO> listCanOrder() {
+        LambdaQueryWrapper<UserTokenInfoDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(UserTokenInfoDO::getStatus, 1);
+        lambdaQueryWrapper.eq(UserTokenInfoDO::getIsOrder, 1);
+        lambdaQueryWrapper.eq(UserTokenInfoDO::getIsRestriction, 0);
+        return baseMapper.selectList(lambdaQueryWrapper);
+    }
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/mapper/JntyzxUserRestrictionInfoMapper.java

@@ -0,0 +1,11 @@
+package com.xiang.app.modules.jntyzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface JntyzxUserRestrictionInfoMapper extends BaseMapper<UserRestrictionInfo> {
+}

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

@@ -5,6 +5,7 @@ import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
 import com.xiang.app.modules.jntyzx.entity.resp.JntyzxResponse;
 import com.xiang.app.modules.jntyzx.entity.resp.OrderCreateResp;
 import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
+import com.xiang.app.modules.jntyzx.entity.resp.query.UserInfoResponse;
 
 import java.util.List;
 
@@ -40,4 +41,20 @@ public interface IJntyzxHttpService {
      * @return
      */
     JntyzxResponse healthDeclaration(String token, String openId);
+
+    /**
+     * 根据openid查询
+     * @param token token
+     * @param openId openId
+     * @return
+     */
+    JntyzxResponse<UserInfoResponse> queryByOpenId(String token, String openId);
+
+    /**
+     * 校验会员卡状态
+     * @param token token
+     * @param cardNo    会员卡号
+     * @return
+     */
+    JntyzxResponse checkDefaultNums(String token, String cardNo);
 }

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

@@ -11,6 +11,7 @@ import java.util.List;
 public interface IUserTokenInfoService {
 
     List<UserTokenInfoDO> getAvailableUser();
+    List<UserTokenInfoDO> getCanOrderUser();
     String getToken(String name);
     boolean flushSingleToken(String name);
     boolean flushToken();

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

@@ -5,24 +5,20 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
 import com.xiang.app.modules.jntyzx.constants.UrlConstant;
-import com.xiang.app.modules.jntyzx.entity.pojo.OrderInfoDO;
 import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
 import com.xiang.app.modules.jntyzx.entity.req.SubscribeRequest;
 import com.xiang.app.modules.jntyzx.entity.req.SubscribeVo;
 import com.xiang.app.modules.jntyzx.entity.resp.JntyzxResponse;
 import com.xiang.app.modules.jntyzx.entity.resp.OrderCreateResp;
 import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
+import com.xiang.app.modules.jntyzx.entity.resp.query.UserInfoResponse;
 import com.xiang.app.modules.jntyzx.entity.resp.query.VenueList;
 import com.xiang.app.modules.jntyzx.manage.IOrderCreateInfoManage;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.utils.JntyzxSaltEncodeUtils;
 import com.xiang.xmc.service.cache.service.IRedisService;
-import com.xiang.xmc.service.http.helper.BaseHttpHelp;
 import com.xiang.xmc.service.http.helper.HttpHelper;
-import com.xiang.xmc.service.http.helper.HttpHelperFactory;
-import com.xiang.xservice.basic.utils.Base64;
 import com.xiang.xservice.basic.utils.JsonUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,9 +27,6 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -153,14 +146,15 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService {
         Map<String, String> params = Maps.newHashMap();
         params.put("X-Access-Token", token);
         String resp = HttpHelper.doPost(UrlConstant.ADD_SUBSCRIBE, params, JsonUtils.toJsonString(subscribeRequest));
+        log.info("[江体小程序] 羽毛球场地下单响应结果:{}", resp);
         if (StringUtils.isBlank(resp)) {
-            log.info("请求结果为空");
+            log.info("[resp] 请求结果为空");
             return null;
         }
         JntyzxResponse<OrderCreateResp> response = JSON.parseObject(resp, new TypeReference<JntyzxResponse<OrderCreateResp>>() {
         });
         if (Objects.isNull(response)) {
-            log.info("请求结果为空");
+            log.info("[res ==> response] 请求结果为空");
             return null;
         }
         return response;
@@ -179,6 +173,37 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService {
         return JSON.parseObject(respStr, JntyzxResponse.class);
     }
 
+    @Override
+    public JntyzxResponse<UserInfoResponse> queryByOpenId(String token, String openId) {
+        Map<String, String> params = Maps.newHashMap();
+        params.put("openId", openId);
+        Map<String, String> headers = Maps.newHashMap();
+        headers.put("X-Access-Token", token);
+
+        String resp = HttpHelper.doGet(UrlConstant.QUERY_BY_OPEN_ID, headers, params);
+        JntyzxResponse<UserInfoResponse> response = JSON.parseObject(resp, new TypeReference<JntyzxResponse<UserInfoResponse>>() {
+        });
+        if (Objects.isNull(response)) {
+            log.info("请求结果为空！");
+            return null;
+        }
+        return response;
+    }
+
+    @Override
+    public JntyzxResponse checkDefaultNums(String token, String cardNo) {
+        Map<String, String> params = Maps.newHashMap();
+        params.put("consNumber", cardNo);
+        Map<String, String> headers = Maps.newHashMap();
+        headers.put("X-Access-Token", token);
+
+        String resp = HttpHelper.doGet(UrlConstant.CHECK_NUM, headers, params);
+        if (StringUtils.isBlank(resp)) {
+            return null;
+        }
+        return JSON.parseObject(resp, JntyzxResponse.class);
+    }
+
     private static JSONObject buildParamJsonObj(String openId) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id", "1702581215097257986");

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

@@ -12,10 +12,9 @@ import com.xiang.app.modules.jntyzx.manage.IOrderCreateInfoManage;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.service.IJtOrderService;
 import com.xiang.xmc.service.cache.service.IRedisService;
-import com.xiang.xservice.basic.utils.JsonUtils;
+import com.xiang.xservice.basic.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -76,7 +75,12 @@ public class OrderInfoServiceImpl implements IJtOrderService {
         } else {
             dingTalkFactory.sendMsg("用户" + userTokenInfoDO.getName() + "预订场地号:" + venueInfoDOS.get(0).getPlaceName() + "结果返回:" + JSON.toJSONString(orderResp));
             if (orderResp.getMessage().contains("锁卡")) {
-                return true;
+                log.info("有锁卡风险，不在请求，用户:{}", userTokenInfoDO.getName());
+                throw new BusinessException("即将锁卡，不再请求");
+            }
+            if (orderResp.getMessage().contains("限制")) {
+                log.info("改会员卡被限制，不在请求，用户:{}", userTokenInfoDO.getName());
+                throw new BusinessException("会员卡被限制，不在请求");
             }
             return false;
         }

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

@@ -1,11 +1,15 @@
 package com.xiang.app.modules.jntyzx.service.impl;
 
 import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+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;
+import com.xiang.app.modules.jntyzx.entity.resp.query.UserInfoResponse;
+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.utils.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -27,6 +31,7 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
     private final IUserTokenInfoManage userTokenInfoManage;
     private final IJntyzxHttpService jntyzxHttpService;
     private final JtDingTalkFactory jtDingTalkFactory;
+    private final IUserRestrictionManage userRestrictionManage;
 
 
     @Override
@@ -43,6 +48,11 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
         return userTokenInfoDO.getToken();
     }
 
+    @Override
+    public List<UserTokenInfoDO> getCanOrderUser() {
+        return userTokenInfoManage.listCanOrder();
+    }
+
     @Override
     public boolean flushSingleToken(String name) {
         UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(name);
@@ -56,12 +66,15 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
 
     @Override
     public boolean flushToken() {
-        List<UserTokenInfoDO> userTokenInfoDOS = userTokenInfoManage.listUser();
+        List<UserTokenInfoDO> userTokenInfoDOS = userTokenInfoManage.list();
         if (CollectionUtils.isEmpty(userTokenInfoDOS)) {
             log.info("【心跳监测】查询用户信息为空，无需操作");
             return true;
         }
-        userTokenInfoDOS.parallelStream().forEach(this::healthDeclaration);
+        userTokenInfoDOS.forEach(this::healthDeclaration);
+        // 信息更新
+        userTokenInfoDOS = userTokenInfoManage.list();
+        userTokenInfoDOS.forEach(this::queryMemberCardInfo);
         return true;
     }
 
@@ -85,9 +98,51 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
         boolean flag = StringUtils.contains(jntyzxResponse.getMessage(), "已存在");
         if (flag) {
             log.info("用户名:{}心跳成功✅✅✅✅✅✅", userTokenInfoDO.getName());
+            userTokenInfoDO.setStatus(1);
+            userTokenInfoManage.updateById(userTokenInfoDO);
         } else {
             jtDingTalkFactory.sendMsg("用户名:" + userTokenInfoDO.getName() + "心跳失败，消息:" + jntyzxResponse.getMessage());
+            userTokenInfoDO.setStatus(0);
+            userTokenInfoManage.updateById(userTokenInfoDO);
         }
         return flag;
     }
+
+    /**
+     * 查询用户信息
+     *
+     * @param userTokenInfoDO 用户
+     *
+     * @return
+     */
+    private void queryMemberCardInfo(UserTokenInfoDO userTokenInfoDO) {
+        JntyzxResponse<UserInfoResponse> response = jntyzxHttpService.queryByOpenId(userTokenInfoDO.getToken(), userTokenInfoDO.getOpenId());
+        if (Objects.isNull(response)) {
+            return;
+        }
+        if (response.getSuccess()) {
+            UserInfoResponse userInfoResponse = response.getResult();
+            userTokenInfoDO.setMemberCardNo(userInfoResponse.getConsCard());
+            if (StringUtils.isNotBlank(userInfoResponse.getRestrictionDeadline2())) {
+                userTokenInfoDO.setIsRestriction(1);
+                userTokenInfoDO.setIsOrder(0);
+                UserRestrictionInfo userRestrictionInfo = userRestrictionManage.queryByUserId(userTokenInfoDO.getId());
+                if (Objects.isNull(userRestrictionInfo)) {
+                    userRestrictionInfo = new UserRestrictionInfo();
+                    userRestrictionInfo.setUserId(userTokenInfoDO.getId());
+                    userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline2()));
+                    userRestrictionInfo.setRestrictionDesc(userInfoResponse.getRestrictionDescription());
+                    userRestrictionManage.save(userRestrictionInfo);
+                } else {
+                    userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline2()));
+                    userRestrictionInfo.setRestrictionDesc(userInfoResponse.getRestrictionDescription());
+                    userRestrictionManage.updateById(userRestrictionInfo);
+                }
+            } else {
+                userTokenInfoDO.setIsRestriction(0);
+                userTokenInfoDO.setIsOrder(1);
+            }
+            userTokenInfoManage.updateById(userTokenInfoDO);
+        }
+    }
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/utils/MsgSendUtils.java

@@ -0,0 +1,42 @@
+package com.xiang.app.modules.jntyzx.utils;
+
+import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
+import com.xiang.xmc.service.cache.service.IRedisService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-01-26 09:14
+ */
+@Component
+@RequiredArgsConstructor
+public class MsgSendUtils {
+
+    private final IRedisService redisService;
+    private final JtDingTalkFactory jtDingTalkFactory;
+
+    /**
+     * 限制钉钉消息发送 1小时最多5次
+     * @param redisKey      redis缓存的key
+     * @param msgContent    消息内容
+     */
+    public void sendMsgRestrict1Hours(String redisKey, String msgContent) {
+        String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate();
+        String cache = (String) redisService.get(redisKey);
+        if (StringUtils.isNotBlank(cache)) {
+            int sendNum = Integer.parseInt(cache);
+            if (sendNum >= 0 && sendNum <= 5) {
+                jtDingTalkFactory.sendMsg(msgContent);
+                redisService.set(key, String.valueOf(++sendNum), 1, TimeUnit.HOURS);
+            }
+        } else {
+            jtDingTalkFactory.sendMsg(msgContent);
+            redisService.set(key, "0", 1, TimeUnit.HOURS);
+        }
+    }
+}

xservice-server/src/main/java/com/xiang/app/debugger/OrderTest.java

@@ -0,0 +1,90 @@
+package com.xiang.app.debugger;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-02-25 10:23
+ */
+@Slf4j
+public class OrderTest {
+    private static final UserTest userA = new UserTest(1L, "123");
+    private static final UserTest userB = new UserTest(2L, "234");
+    private static final UserTest userC = new UserTest(3L, "345");
+    private static final List<UserTest> users = Lists.newArrayList(userA, userB, userC);
+
+    private static final VenueInfoTest v1 = new VenueInfoTest(1L, "一号场地");
+    private static final VenueInfoTest v2 = new VenueInfoTest(2L, "二号场地");
+    private static final VenueInfoTest v3 = new VenueInfoTest(3L, "三号场地");
+    private static final Map<String, VenueInfoTest> venueInfoMap = Maps.newHashMap();
+    static {
+        venueInfoMap.put(v1.getPlaceName(), v1);
+        venueInfoMap.put(v2.getPlaceName(), v2);
+        venueInfoMap.put(v3.getPlaceName(), v3);
+    }
+
+    public static void main(String[] args) {
+        OrderTest orderTest = new OrderTest();
+        orderTest.test();
+    }
+
+    public void test() {
+        users.parallelStream().forEach(user -> {
+            try {
+                for (String placeName : venueInfoMap.keySet()) {
+                    VenueInfoTest venueInfoTest = venueInfoMap.get(placeName);
+                    for (int i = 0; i < 10; i++) {
+                        boolean order = createOrder(venueInfoTest, user);
+                        if (order) {
+                            return;
+                        }
+                        try {
+                            log.info("睡眠中 1.25s");
+                            Thread.sleep(1250);
+                        } catch (InterruptedException e) {
+                            log.error("睡眠失败～～～");
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                // 关键点：异常只影响当前 user
+                log.error("createOrder 异常，user={}", user.getId(), e);
+                return; // 结束这个 user，不影响其他 user
+            }
+        });
+    }
+
+    private boolean createOrder(VenueInfoTest venueInfoTest, UserTest userTest) {
+        log.info("用户:{}======>请求三方接口中", userTest.getUsername());
+        String order = order(venueInfoTest, userTest);
+        log.info("用户:{}======>请求结果：:{}", userTest.getUsername(), order);
+        if (order.contains("成功")) {
+            return true;
+        }
+        if (order.contains("锁卡")) {
+            return true;
+        }
+        return false;
+    }
+
+    private String order(VenueInfoTest venueInfoTest, UserTest userTest) {
+        String msg = "～～～";
+        if (venueInfoTest.getId() == 1L && userTest.getId() == 2L) {
+            msg = "用户" + userTest.getUsername() + "预定成功！";
+            return msg;
+        }
+        if (userTest.getId() == 1L) {
+            msg = "用户" + userTest.getUsername() + "频繁请求接口，将锁卡";
+            return msg;
+        }
+        if (venueInfoTest.getId() == 2L) {
+            msg = "场地" + venueInfoTest.getPlaceName() + "已被预订";
+        }
+        return msg;
+    }
+}

xservice-server/src/main/java/com/xiang/app/debugger/UserTest.java

@@ -0,0 +1,16 @@
+package com.xiang.app.debugger;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-02-25 10:24
+ */
+@Data
+@AllArgsConstructor
+public class UserTest {
+
+    private Long id;
+    private String username;
+}

xservice-server/src/main/java/com/xiang/app/debugger/VenueInfoTest.java

@@ -0,0 +1,18 @@
+package com.xiang.app.debugger;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-02-25 10:28
+ */
+@Data
+@AllArgsConstructor
+public class VenueInfoTest {
+
+    private Long id;
+
+    private String placeName;
+
+}

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

@@ -1,11 +1,13 @@
 package com.xiang.app.schedule.jntyzx;
 
-import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.google.common.collect.Maps;
+import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
 import com.xiang.app.modules.jntyzx.service.IVenueService;
+import com.xiang.app.modules.jntyzx.utils.MsgSendUtils;
 import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
 import com.xiang.app.modules.jntyzx.utils.WeekendUtils;
 import com.xiang.core.quartz.annotation.XxzJob;
@@ -18,9 +20,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -34,8 +37,8 @@ public class JtVenuePullTask {
 
     private final IUserTokenInfoService userTokenInfoService;
     private final IJntyzxHttpService jntyzxHttpService;
-    private final JtDingTalkFactory jtDingTalkFactory;
     private final IVenueService venueService;
+    private final MsgSendUtils msgSendUtils;
 
     @XxzJob(name = "jtVenueInfoPullTask")
     @GetMapping("/jtVenueInfoPullTask")
@@ -47,6 +50,8 @@ public class JtVenuePullTask {
             return;
         }
         String token;
+        LocalDateTime now = LocalDateTime.now();
+        int dayOfWeek = now.getDayOfWeek().getValue();
 
         for (UserTokenInfoDO userTokenInfoDO : availableUser) {
             if (Objects.isNull(userTokenInfoDO)) {
@@ -62,19 +67,40 @@ public class JtVenuePullTask {
             }
             venueService.saveOrUpdateTodayVenueInfo(sitePositionLists);
 
-            sitePositionLists = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+            sitePositionLists = handleMsgSendList(sitePositionLists, dayOfWeek);
             if (CollectionUtils.isEmpty(sitePositionLists)) {
                 return;
             }
-            sitePositionLists = sitePositionLists.stream().filter(item -> StringUtils.equals(item.getContacts(), "0")).toList();
-            if (CollectionUtils.isEmpty(sitePositionLists)) {
-                return;
-            }
-            StringBuffer msg = new StringBuffer("查询到20:00-22:00空闲场地信息===>时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n");
+
+            StringBuffer msg = new StringBuffer(
+                    "查询到20:00-22:00空闲场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n");
             sitePositionLists.forEach(item -> {
                 msg.append(item.getPlaceName()).append("\n");
             });
-            jtDingTalkFactory.sendMsg(msg.toString());
+
+            String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate();
+            msgSendUtils.sendMsgRestrict1Hours(key, msg.toString());
+            return;
         }
     }
+
+    private List<SitePositionList> handleMsgSendList(List<SitePositionList> sitePositionLists, int dayOfWeek) {
+        // 过滤出来8-10的未订购的场地信息
+        sitePositionLists = sitePositionLists.stream()
+                .filter(VenueInfoUtils::get8210VenueInfo)
+                .filter(item -> StringUtils.equals(item.getContacts(), "0")).toList();
+        // 周六周日过滤小馆，不查询当天小馆信息
+        if (dayOfWeek == 6 || dayOfWeek == 7) {
+            return sitePositionLists.stream()
+                    .filter(item -> !item.getPlaceName().contains("小馆"))
+                    .toList();
+        }
+        Map<String, SitePositionList> mapByName = Maps.newLinkedHashMap();
+        for (SitePositionList sitePositionList : sitePositionLists) {
+            if (!mapByName.containsKey(sitePositionList.getPlaceName())) {
+                mapByName.put(sitePositionList.getPlaceName(), sitePositionList);
+            }
+        }
+        return mapByName.values().stream().toList();
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.xiang.app.schedule.jntyzx;
 
+import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
 import com.xiang.app.modules.jntyzx.service.IJtOrderService;
@@ -9,6 +10,8 @@ import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
 import com.xiang.core.quartz.annotation.XxzJob;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,30 +29,47 @@ public class JtVenueSubscribeTask {
     private final IUserTokenInfoService userTokenInfoService;
     private final IJtOrderService jtOrderService;
     private final IVenueService venueService;
+    private final JtDingTalkFactory jtDingTalkFactory;
 
     @XxzJob(name = "jtVenueSubscribeTask")
     @GetMapping("/jtVenueSubscribeTask")
     public void handle() {
         log.info("【Subscribe】 江体场地预定定时任务启动!!! time:{}", System.currentTimeMillis());
 
-        List<UserTokenInfoDO> users = userTokenInfoService.getAvailableUser();
+        List<UserTokenInfoDO> users = userTokenInfoService.getCanOrderUser();
+        if (CollectionUtils.isEmpty(users)) {
+            log.info("暂无可下单用户， time:{}", System.currentTimeMillis());
+            jtDingTalkFactory.sendMsg("暂无可下单用户， time:" + System.currentTimeMillis());
+            return;
+        }
         List<VenueInfoDO> venueInfoDOS = venueService.queryTomorrowCanBuyVenue();
-
         Map<String, List<VenueInfoDO>> venueInfoMap = venueInfoDOS.stream().filter(VenueInfoUtils::get8210VenueInfo).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
+        if (MapUtils.isEmpty(venueInfoMap)) {
+            log.info("暂无可下单场地，time:{}", System.currentTimeMillis());
+            return;
+        }
 
-        venueInfoMap.keySet().parallelStream().forEach(placeName -> {
-            List<VenueInfoDO> venueInfoDOList = venueInfoMap.get(placeName);
-            users.forEach(user -> {
-                for (int i = 0; i < 10; i++) {
-                    boolean order = jtOrderService.createOrder(venueInfoDOList, user);
-                    if (order) {
-                        return;
+        users.parallelStream().forEach(user -> {
+            try {
+                for (String placeName : venueInfoMap.keySet()) {
+                    List<VenueInfoDO> venueInfoDOList = venueInfoMap.get(placeName);
+                    for (int i = 0; i < 10; i++) {
+                        boolean order = jtOrderService.createOrder(venueInfoDOList, user);
+                        if (order) {
+                            return;
+                        }
+                        try {
+                            Thread.sleep(1250);
+                        } catch (InterruptedException e) {
+                            log.error("睡眠失败～～～");
+                        }
                     }
                 }
-            });
+            } catch (Exception e) {
+                // 关键点：异常只影响当前 user
+                log.error("createOrder 异常，user={}", user.getId(), e);
+                return; // 结束这个 user，不影响其他 user
+            }
         });
-
-
-
     }
 }

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

@@ -0,0 +1,61 @@
+package com.xiang.app.schedule.jntyzx;
+
+import com.google.common.collect.Maps;
+import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
+import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
+import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
+import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
+import com.xiang.app.modules.jntyzx.utils.WeekendUtils;
+import com.xiang.core.quartz.annotation.XxzJob;
+import com.xiang.xservice.basic.utils.DateUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-01-19 14:00
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class JtVenueTodaySubscribeTask {
+
+    private final IJntyzxHttpService jntyzxHttpService;
+    private final IUserTokenInfoService userTokenInfoService;
+    private final JtDingTalkFactory jtDingTalkFactory;
+
+    @XxzJob(name = "jtVenueTodaySubscribeTask")
+    @GetMapping("/jtVenueTodaySubscribeTask")
+    public void handle() {
+        String token = userTokenInfoService.getToken("Xiang");
+        if (StringUtils.isBlank(token)) {
+            return;
+        }
+        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailable(WeekendUtils.isWeekend(), token);
+        if (CollectionUtils.isEmpty(sitePositionLists)) {
+            return;
+        }
+        sitePositionLists = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+        Map<String, SitePositionList> map = Maps.newLinkedHashMap();
+        for (SitePositionList sitePositionList : sitePositionLists) {
+            if (map.containsKey(sitePositionList.getPlaceName())) {
+                continue;
+            }
+            map.put(sitePositionList.getPlaceName(), sitePositionList);
+        }
+        StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()) + " 20:00-22:00\n");
+        map.forEach((placeName, sitePositionList) -> {
+            msg.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
+        });
+        jtDingTalkFactory.sendMsg(msg.toString());
+    }
+}

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

@@ -4,6 +4,7 @@ package com.xiang.app.schedule.jntyzx;
 import com.google.common.collect.Maps;
 import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
+import com.xiang.app.modules.jntyzx.entity.resp.JntyzxResponse;
 import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
@@ -15,18 +16,14 @@ import com.xiang.xservice.basic.utils.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Component
@@ -47,37 +44,44 @@ public class JtVenueTomorrowPullTask {
             log.info("当前无可用用户查询场地信息！");
             return;
         }
-        String token;
-        for (UserTokenInfoDO userTokenInfoDO : availableUser) {
-            if (Objects.isNull(userTokenInfoDO)) {
-                continue;
-            }
-            token = userTokenInfoDO.getToken();
-            if (StringUtils.isBlank(token)) {
-                continue;
-            }
-            List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailableTomorrow(WeekendUtils.isWeekend(), token);
-            if (CollectionUtils.isEmpty(sitePositionLists)) {
-                continue;
-            }
-            venueService.saveTomorrowVenueInfo(sitePositionLists);
-
-            sitePositionLists = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
-            if (CollectionUtils.isEmpty(sitePositionLists)) {
-                return;
-            }
-            Map<String, SitePositionList> map = Maps.newLinkedHashMap();
-            for (SitePositionList sitePositionList : sitePositionLists) {
-                if (map.containsKey(sitePositionList.getPlaceName())) {
-                    continue;
+        // 用户信息
+        StringBuffer userMsg = new StringBuffer();
+        availableUser.forEach(item -> {
+            JntyzxResponse jntyzxResponse = jntyzxHttpService.checkDefaultNums(item.getToken(), item.getMemberCardNo());
+            if (Objects.nonNull(jntyzxResponse)) {
+                if (jntyzxResponse.getSuccess()) {
+                    userMsg.append("订购人:").append(item.getName()).append("正常下单\n");
+                } else {
+                    userMsg.append("订购人：").append(item.getName()).append(jntyzxResponse.getMessage()).append("\n");
                 }
-                map.put(sitePositionList.getPlaceName(), sitePositionList);
             }
-            StringBuffer msg = new StringBuffer("查询场地信息===>时间:\n" + DateUtils.getDateFromDate(LocalDate.now()) + "  20:00-22:00\n");
-            map.forEach((placeName, sitePositionList) -> {
-                msg.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
-            });
-            jtDingTalkFactory.sendMsg(msg.toString());
+        });
+        jtDingTalkFactory.sendMsg(userMsg.toString());
+
+        // 场地信息
+        UserTokenInfoDO userTokenInfoDO = availableUser.get(0);
+        String token = userTokenInfoDO.getToken();
+        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailableTomorrow(WeekendUtils.isWeekend(), token);
+        if (CollectionUtils.isEmpty(sitePositionLists)) {
+            return;
         }
+        venueService.saveTomorrowVenueInfo(sitePositionLists);
+        sitePositionLists = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+        if (CollectionUtils.isEmpty(sitePositionLists)) {
+            return;
+        }
+        Map<String, SitePositionList> map = Maps.newLinkedHashMap();
+        for (SitePositionList sitePositionList : sitePositionLists) {
+            if (map.containsKey(sitePositionList.getPlaceName())) {
+                continue;
+            }
+            map.put(sitePositionList.getPlaceName(), sitePositionList);
+        }
+        StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + " 20:00-22:00\n");
+        map.forEach((placeName, sitePositionList) -> {
+            msg.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
+        });
+        jtDingTalkFactory.sendMsg(msg.toString());
     }
+
 }