From 906a1d84fa8b095eb8dcba76a0b86c463ac94e04 Mon Sep 17 00:00:00 2001 From: xiang Date: Thu, 15 Jan 2026 23:25:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jntyzx/service/IJntyzxHttpService.java | 2 +- .../service/impl/JntyzxHttpServiceImpl.java | 8 ++++---- .../service/impl/OrderInfoServiceImpl.java | 16 +++++++++++----- .../service/impl/UserTokenInfoServiceImpl.java | 2 +- .../schedule/jntyzx/JtVenueSubscribeTask.java | 2 +- .../src/main/resources/application.yml | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/IJntyzxHttpService.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/IJntyzxHttpService.java index 6df703d..aa2a1a2 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/IJntyzxHttpService.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/IJntyzxHttpService.java @@ -31,7 +31,7 @@ public interface IJntyzxHttpService { * 订单创建 * @return */ - JntyzxResponse createOrder(List venueInfos, String token); + JntyzxResponse createOrder(List venueInfos, String token, String openId); /** * 心跳监测 diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/JntyzxHttpServiceImpl.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/JntyzxHttpServiceImpl.java index 41c5fbc..e53495e 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/JntyzxHttpServiceImpl.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/JntyzxHttpServiceImpl.java @@ -112,7 +112,7 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService { } @Override - public JntyzxResponse createOrder(List venueInfos, String token) { + public JntyzxResponse createOrder(List venueInfos, String token, String openId) { List vos = Lists.newArrayList(); for (VenueInfoDO venueInfo : venueInfos) { SubscribeVo subscribeVo = new SubscribeVo(); @@ -141,7 +141,7 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService { vos.add(subscribeVo); } - JSONObject jsonObject = buildParamJsonObj(); + JSONObject jsonObject = buildParamJsonObj(openId); SubscribeRequest subscribeRequest = new SubscribeRequest(); subscribeRequest.setSubscribeVos(vos); @@ -179,7 +179,7 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService { return JSON.parseObject(respStr, JntyzxResponse.class); } - private static JSONObject buildParamJsonObj() { + private static JSONObject buildParamJsonObj(String openId) { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", "1702581215097257986"); jsonObject.put("createBy", null); @@ -187,7 +187,7 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService { jsonObject.put("updateBy", null); jsonObject.put("updateTime", null); jsonObject.put("sysOrgCode", null); - jsonObject.put("openId", "o21MX4y7whXCGjvUTGP6CTz2HbD8"); + jsonObject.put("openId", openId); jsonObject.put("nickName", "1"); jsonObject.put("unionId", null); jsonObject.put("avatarUrl", "https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132"); diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/OrderInfoServiceImpl.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/OrderInfoServiceImpl.java index 979981c..369e932 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/OrderInfoServiceImpl.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/OrderInfoServiceImpl.java @@ -45,13 +45,13 @@ public class OrderInfoServiceImpl implements IJtOrderService { @Override public boolean createOrder(List venueInfoDOS, UserTokenInfoDO userTokenInfoDO) { - String order = (String) redisService.get(RedisKeyConstant.JNTYZX_ORDER_CREATE_KEY + userTokenInfoDO.getName()); + String order = (String) redisService.get(RedisKeyConstant.JNTYZX_ORDER_CREATE_KEY + userTokenInfoDO.getName() + LocalDate.now()); if (StringUtils.isNotBlank(order)) { log.info("用户:{}已经有成功预订了场地", userTokenInfoDO.getName()); return true; } - JntyzxResponse orderResp = jntyzxHttpService.createOrder(venueInfoDOS, userTokenInfoDO.getToken()); + JntyzxResponse orderResp = jntyzxHttpService.createOrder(venueInfoDOS, userTokenInfoDO.getToken(), userTokenInfoDO.getOpenId()); if (Objects.isNull(orderResp)) { return false; } @@ -60,7 +60,7 @@ public class OrderInfoServiceImpl implements IJtOrderService { if (Objects.nonNull(result)) { String orderId = result.getId(); if (StringUtils.isNotBlank(orderId)) { - redisService.set(RedisKeyConstant.JNTYZX_ORDER_CREATE_KEY + userTokenInfoDO.getName(), orderId); + redisService.set(RedisKeyConstant.JNTYZX_ORDER_CREATE_KEY + userTokenInfoDO.getName() + LocalDate.now(), orderId); OrderInfoDO orderInfoDO = new OrderInfoDO(); orderInfoDO.setOrderId(orderId); orderInfoDO.setCreateTime(LocalDateTime.now()); @@ -71,8 +71,14 @@ public class OrderInfoServiceImpl implements IJtOrderService { orderCreateInfoManage.save(orderInfoDO); } } + dingTalkFactory.sendMsg("用户" + userTokenInfoDO.getName() + "预订场地号:" + venueInfoDOS.get(0).getPlaceName() + "结果返回:" + JSON.toJSONString(orderResp)); + return true; + } else { + dingTalkFactory.sendMsg("用户" + userTokenInfoDO.getName() + "预订场地号:" + venueInfoDOS.get(0).getPlaceName() + "结果返回:" + JSON.toJSONString(orderResp)); + if (orderResp.getMessage().contains("锁卡")) { + return true; + } + return false; } - dingTalkFactory.sendMsg("用户" + userTokenInfoDO.getName() + "预订场地号:" + venueInfoDOS.get(0).getPlaceName() + "结果返回:" + JSON.toJSONString(orderResp)); - return true; } } 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 e61dcde..b4eba9d 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 @@ -73,7 +73,7 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService { } userTokenInfoDO.setToken(token); boolean flag = userTokenInfoManage.updateById(userTokenInfoDO); - jtDingTalkFactory.sendMsg("用户：" + name + "token更新成功！"); + jtDingTalkFactory.sendMsg("用户：" + name + "，token更新成功！"); return flag; } diff --git a/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java b/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java index ff5665e..a1084e9 100644 --- a/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java +++ b/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java @@ -35,7 +35,7 @@ public class JtVenueSubscribeTask { List users = userTokenInfoService.getAvailableUser(); List venueInfoDOS = venueService.queryTomorrowCanBuyVenue(); - Map> venueInfoMap = venueInfoDOS.stream().filter(VenueInfoUtils::get123VenueInfo4Mor).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName)); + Map> venueInfoMap = venueInfoDOS.stream().filter(VenueInfoUtils::get8210VenueInfo).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName)); venueInfoMap.keySet().parallelStream().forEach(placeName -> { List venueInfoDOList = venueInfoMap.get(placeName); diff --git a/xservice-server/src/main/resources/application.yml b/xservice-server/src/main/resources/application.yml index 7da0fe4..c8a6a59 100644 --- a/xservice-server/src/main/resources/application.yml +++ b/xservice-server/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod + active: test application: name: xservice-cornucopia main: