xservice/xservice-cornucopia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:bug修复

Browse Source
This commit is contained in:
xiang
2026-01-15 23:25:00 +08:00
parent ed59385672
commit 906a1d84fa
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ public interface IJntyzxHttpService {
* 订单创建
* @return
*/
JntyzxResponse<OrderCreateResp> createOrder(List<VenueInfoDO> venueInfos, String token);
JntyzxResponse<OrderCreateResp> createOrder(List<VenueInfoDO> venueInfos, String token, String openId);
/**
* 心跳监测

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

@@ -112,7 +112,7 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService {
}
@Override
public JntyzxResponse<OrderCreateResp> createOrder(List<VenueInfoDO> venueInfos, String token) {
public JntyzxResponse<OrderCreateResp> createOrder(List<VenueInfoDO> venueInfos, String token, String openId) {
List<SubscribeVo> 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");

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

@@ -45,13 +45,13 @@ public class OrderInfoServiceImpl implements IJtOrderService {
@Override
public boolean createOrder(List<VenueInfoDO> 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<OrderCreateResp> orderResp = jntyzxHttpService.createOrder(venueInfoDOS, userTokenInfoDO.getToken());
JntyzxResponse<OrderCreateResp> 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;
}
}
}

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

@@ -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;
}

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

@@ -35,7 +35,7 @@ public class JtVenueSubscribeTask {
List<UserTokenInfoDO> users = userTokenInfoService.getAvailableUser();
List<VenueInfoDO> venueInfoDOS = venueService.queryTomorrowCanBuyVenue();
Map<String, List<VenueInfoDO>> venueInfoMap = venueInfoDOS.stream().filter(VenueInfoUtils::get123VenueInfo4Mor).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
Map<String, List<VenueInfoDO>> venueInfoMap = venueInfoDOS.stream().filter(VenueInfoUtils::get8210VenueInfo).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
venueInfoMap.keySet().parallelStream().forEach(placeName -> {
List<VenueInfoDO> venueInfoDOList = venueInfoMap.get(placeName);

2
xservice-server/src/main/resources/application.yml
View File

@@ -1,6 +1,6 @@
spring:
profiles:
active: prod
active: test
application:
name: xservice-cornucopia
main: