diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/resp/query/UserInfoResponse.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/resp/query/UserInfoResponse.java index 2fca3bf..d9d8d50 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/resp/query/UserInfoResponse.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/resp/query/UserInfoResponse.java @@ -1,5 +1,6 @@ package com.xiang.app.modules.jntyzx.entity.resp.query; +import com.alibaba.fastjson.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -94,6 +95,7 @@ public class UserInfoResponse { /** * 封禁截止日期 */ + @JSONField(name = "restrictionDeadline") private String restrictionDeadline; /** * 封禁原因 @@ -102,5 +104,6 @@ public class UserInfoResponse { /** * 封禁截止日期 */ - private String RestrictionDeadline; + @JSONField(name = "RestrictionDeadline") + private String RestrictionDeadline2; } diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/UserTokenInfoServiceImpl.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/UserTokenInfoServiceImpl.java index 2d1c110..fc6fb9a 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/UserTokenInfoServiceImpl.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/UserTokenInfoServiceImpl.java @@ -71,10 +71,10 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService { log.info("【心跳监测】查询用户信息为空,无需操作"); return true; } - userTokenInfoDOS.parallelStream().forEach(this::healthDeclaration); + userTokenInfoDOS.forEach(this::healthDeclaration); // 信息更新 userTokenInfoDOS = userTokenInfoManage.list(); - userTokenInfoDOS.parallelStream().forEach(this::queryMemberCardInfo); + userTokenInfoDOS.forEach(this::queryMemberCardInfo); return true; } @@ -123,18 +123,18 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService { if (response.getSuccess()) { UserInfoResponse userInfoResponse = response.getResult(); userTokenInfoDO.setMemberCardNo(userInfoResponse.getConsCard()); - if (StringUtils.isNotBlank(userInfoResponse.getRestrictionDeadline())) { + 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.getRestrictionDeadline())); + userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline2())); userRestrictionInfo.setRestrictionDesc(userInfoResponse.getRestrictionDescription()); userRestrictionManage.save(userRestrictionInfo); } else { - userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline())); + userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline2())); userRestrictionInfo.setRestrictionDesc(userInfoResponse.getRestrictionDescription()); userRestrictionManage.updateById(userRestrictionInfo); }