10 Commits

Author SHA1 Message Date
Xiang
20a92a22bf fix:修改定时任务时间 2026-05-13 15:57:39 +08:00
Xiang
3c6ce446c7 fix:捡漏任务 2026-05-12 10:08:16 +08:00
Xiang
9d0ed87191 fix:zlb订单查询 2026-05-11 09:59:58 +08:00
Xiang
d7be3786c3 feat:zlb场地排序 2026-05-11 08:45:22 +08:00
44efd5689b Merge pull request '江体小程序和zlb接口开发' (#1) from feat/script_v1 into master
Reviewed-on: https://gitea.xiangtech.xyz/XiangZ/script/pulls/1
2026-05-10 09:06:33 +00:00
Xiang
0f7af30789 feat:zlb场地排序 2026-05-09 16:43:55 +08:00
Xiang
b4ed93171c feat:日志打印优化 2026-05-09 15:42:21 +08:00
Xiang
6902a16cfa feat:日志打印优化 2026-05-09 15:24:44 +08:00
Xiang
60992dc4f6 feat:zlb江体优化 2026-05-09 15:17:12 +08:00
Xiang
cb21b38287 feat:江体小程序定时任务优化 2026-05-09 14:58:07 +08:00
22 changed files with 494 additions and 223 deletions

View File

@@ -8,19 +8,27 @@ import lombok.Getter;
public enum ScheduleEnums {
/**
* 0glados 1芬玩岛 2江体小程序 3江体zlb 4DDNS
* 0glados
* 1芬玩岛
* 2DDNS
* 3江体zlb
* 4江体小程序
*/
/**
* Aliyun DDNS任务
*/
DOMAIN_DYNAMIC_ANALYSIS_TASK(4, "domain", "domainDynamicAnalysisTask"),
/**
* Glados任务
*/
GLADOS_CHECK_IN_TASK(0, "glados", "gladosCheckInTask"),
/**
* Aliyun DDNS任务
*/
DOMAIN_DYNAMIC_ANALYSIS_TASK(2, "domain", "domainDynamicAnalysisTask"),
/**
* 芬玩岛 任务
*/
/**
* 江体 ZLB任务
*/
@@ -30,8 +38,13 @@ public enum ScheduleEnums {
ZLB_SITE_DAY_TASK(3, "zlb", "zlbSiteDayTask"),
ZLB_ORDER_CREATE_TASK(3, "zlb", "zlbOrderCreateTask"),
ZLB_USER_CONFIG_TASK(3, "zlb", "zlbUserConfigTask"),
ZLB_ORDER_QUERY_TASK(3, "zlb", "zlbOrderQueryTask"),
ZLB_ORDER_JL_TASK(3, "zlb", "zlbOrderJlTask"),
/**
* 江体 小程序任务
*/
JNTYZX_TOKEN_REFRESH_TASK(4, "jt-miniApp", "jntyzxTokenRefreshTask"),
JNTYZX_VENUE_INFO_PULL_TASK(4, "jt-miniApp", "jntyzxVenuePullTask"),
JNTYZX_ORDER_SUBSCRIBE_TASK(4, "jt-miniApp", "jntyzxOrderSubscribeTask"),

View File

@@ -0,0 +1,15 @@
package com.xiang.common.manage.jntyzx.zlb;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xiang.common.pojo.jntyzx.zlb.ZlbJlUserInfo;
import java.util.List;
/**
* @Author: xiang
* @Date: 2026-05-12 09:18
*/
public interface IZlbJlUserInfoManage extends IService<ZlbJlUserInfo> {
List<ZlbJlUserInfo> getJlUsers();
}

View File

@@ -0,0 +1,16 @@
package com.xiang.common.manage.jntyzx.zlb;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
import java.time.LocalDate;
import java.util.List;
/**
* @Author: xiang
* @Date: 2026-05-09 15:11
*/
public interface IZlbOrderInfoManage extends IService<ZlbPayOrder> {
List<ZlbPayOrder> queryOrder(LocalDate date);
}

View File

@@ -0,0 +1,27 @@
package com.xiang.common.manage.jntyzx.zlb;
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.common.mapper.ZlbJlUserInfoMapper;
import com.xiang.common.pojo.jntyzx.zlb.ZlbJlUserInfo;
import com.xiang.common.utils.DateUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.util.List;
/**
* @Author: xiang
* @Date: 2026-05-12 09:18
*/
@Service
public class ZlbJlUserInfoManageImpl extends ServiceImpl<ZlbJlUserInfoMapper, ZlbJlUserInfo> implements IZlbJlUserInfoManage {
@Override
public List<ZlbJlUserInfo> getJlUsers() {
LambdaQueryWrapper<ZlbJlUserInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ZlbJlUserInfo::getDay, DateUtils.getDateFromDate(LocalDate.now()));
lambdaQueryWrapper.eq(ZlbJlUserInfo::getDay, DateUtils.getWeekDay(LocalDate.now()));
return baseMapper.selectList(lambdaQueryWrapper);
}
}

View File

@@ -0,0 +1,27 @@
package com.xiang.common.manage.jntyzx.zlb;
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.common.mapper.ZlbOrderInfoMapper;
import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
import com.xiang.common.utils.DateUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.util.List;
/**
* @Author: xiang
* @Date: 2026-05-09 15:11
*/
@Service
public class ZlbOrderInfoManageImpl extends ServiceImpl<ZlbOrderInfoMapper, ZlbPayOrder> implements IZlbOrderInfoManage {
@Override
public List<ZlbPayOrder> queryOrder(LocalDate date) {
LambdaQueryWrapper<ZlbPayOrder> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ZlbPayOrder::getDay, DateUtils.getDateFromDate(date));
lambdaQueryWrapper.eq(ZlbPayOrder::getIsPay, 0);
return baseMapper.selectList(lambdaQueryWrapper);
}
}

View File

@@ -0,0 +1,51 @@
package com.xiang.common.pojo.jntyzx.zlb;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* @Author: xiang
* @Date: 2026-05-11 09:43
*/
@Data
@AllArgsConstructor
public class ZlbOrderDetailResp {
private Integer state;
private Integer blocId;
private Integer stadiumId;
private String stadiumArea;
private String stadiumName;
private String stadiumPhone;
private String stadiumType;
private String stadiumAddress;
private String mapLongitude;
private String mapLatitude;
private String ticketImg;
private String spName;
private String siteName;
private String siteAmount;
// private String orderAmount;
private Integer payNumber;
// private String ticketInfos;
private Integer orderId;
private String orderNo;
private String orderTime;
private String payTime;
private Integer payType;
private String payAmount;
private String discountPayAmount;
private String totalDiscountAmount;
private String isUseCoupon;
private String isUseCard;
private String name;
private String idCard;
private String phone;
private String notice;
private String blocNotice;
private Integer isRefund;
private String ticketCate;
private String spreadAmout;
private Integer isPreferential;
private String doNotWatermarkFlag;
}

View File

@@ -47,4 +47,9 @@ public class ZlbPayOrder {
* 0-未付款,1-已付款
*/
private Integer isPay;
/**
* 订单id
*/
private String orderId;
}

View File

@@ -73,7 +73,7 @@ public class HttpService {
CloseableHttpResponse response = null;
String result = "";
try {
log.info("HTTP请求请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
log.debug("HTTP请求请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
HttpPost httpPost = new HttpPost(url);
httpPost.addHeader("Content-Type", "application/json");
// 创建请求内容
@@ -88,7 +88,7 @@ public class HttpService {
}
response = httpClient.execute(httpPost);
result = EntityUtils.toString(response.getEntity(), "utf-8");
log.info("【POST请求】 请求地址===>{}, 响应结果==={}", url, result);
log.debug("【POST请求】 请求地址===>{}, 响应结果==={}", url, result);
} catch (Exception e) {
log.error("doPost异常", e);
} finally {
@@ -117,10 +117,10 @@ public class HttpService {
httpGet.setHeader(entry.getKey(), entry.getValue());
}
}
log.info("doGet请求请求头:{},请求地址:{}", header, url + request);
log.debug("doGet请求请求头:{},请求地址:{}", header, url + request);
response = httpClient.execute(httpGet);
result = EntityUtils.toString(response.getEntity(), "utf-8");
log.info("【GET请求】, 请求地址===>{}, 响应结果===>{}", url + request, result);
log.debug("【GET请求】, 请求地址===>{}, 响应结果===>{}", url + request, result);
} catch (Exception e) {
log.error("doGet异常", e);
} finally {

View File

@@ -15,7 +15,7 @@ public class DomainDynamicAnalysisTaskConfig {
private final DomainDynamicAnalysisTask domainDynamicAnalysisTask;
@Scheduled(cron = "0 0/30 * * * ? ")
@Scheduled(cron = "0 15,45 * * * ? ")
@GetMapping("/test")
public void dynamicDomainSchedule() {
domainDynamicAnalysisTask.run();

View File

@@ -92,6 +92,7 @@ public class JntyzxUserInfoConfigTask extends BaseScheduleTaskTemplate {
return taskResult;
}
venueInfoDOS = venueInfoDOS.stream()
.filter(item -> !item.getPlaceName().contains("小馆"))
.sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo(item.getPlaceName())))
.toList();
@@ -103,6 +104,7 @@ public class JntyzxUserInfoConfigTask extends BaseScheduleTaskTemplate {
List<UserInfoDO> list = Lists.newArrayList();
int i = 0;
userInfoService.delAll();
for (UserTokenInfoDO user : users) {
VenueInfoDO venueInfoDO = venueInfoDOS.get(i);
UserInfoDO userInfoDO = new UserInfoDO();

View File

@@ -121,18 +121,23 @@ public class JtVenuePullTask extends BaseScheduleTaskTemplate {
}
venueService.saveOrUpdateTodayVenueInfo(sitePositionLists);
List<SitePositionList> sitePositionLists6_8 = handleMsgSendList(sitePositionLists, 1);
StringBuffer msg = new StringBuffer(
"查询到18:00-20:00空闲场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n");
sitePositionLists6_8.forEach(item -> {
msg.append(item.getPlaceName()).append("\n");
});
List<SitePositionList> sitePositionLists8_10 = handleMsgSendList(sitePositionLists, 2);
msg.append("查询到18:00-20:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n");
sitePositionLists8_10.forEach(item -> msg.append(item.getPlaceName()).append("\n"));
StringBuffer msg = new StringBuffer();
List<SitePositionList> sitePositionLists6_8 = handleMsgSendList(sitePositionLists, 1);
if (CollectionUtils.isNotEmpty(sitePositionLists6_8)) {
msg.append("查询到18:00-20:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n");
sitePositionLists6_8.forEach(item -> msg.append(item.getPlaceName()).append("\n"));
}
List<SitePositionList> sitePositionLists8_10 = handleMsgSendList(sitePositionLists, 2);
if (CollectionUtils.isNotEmpty(sitePositionLists8_10)) {
msg.append("查询到20:00-22:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n");
sitePositionLists8_10.forEach(item -> msg.append(item.getPlaceName()).append("\n"));
}
if (StringUtils.isNotBlank(msg)) {
String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate();
msgSendUtils.sendMsgRestrict1Hours(key, msg.toString());
}
taskResult.setSuccess(true);
taskResult.setSummary("查询场地信息成功!时间:" + now);
return taskResult;

View File

@@ -125,7 +125,7 @@ public class JtVenueTomorrowPullTask extends BaseScheduleTaskTemplate {
}
map.put(sitePositionList.getPlaceName(), sitePositionList);
}
StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + time + "\n");
StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + " " + time + "\n");
map.forEach((placeName, sitePositionList) -> {
msg.append(placeName).append("订购人:").append(sitePositionList.getContacts()).append("\n");
});

View File

@@ -38,19 +38,19 @@ public class VenueInfoUtils {
}
public static int sortVenueInfo(String placeName) {
if (placeName.contains("十号")) {
if (placeName.contains("十号") || placeName.contains("10")) {
return 0;
}
if (placeName.contains("九号")) {
if (placeName.contains("九号") || placeName.contains("9")) {
return 1;
}
if (placeName.contains("二号")) {
if (placeName.contains("二号") || placeName.contains("2")) {
return 2;
}
if (placeName.contains("八号")) {
if (placeName.contains("八号") || placeName.contains("8")) {
return 3;
}
if (placeName.contains("七号")) {
if (placeName.contains("七号") || placeName.contains("7")) {
return 4;
}
return 5;

View File

@@ -0,0 +1,80 @@
package com.xiang.service.module.jntyzx.zlb.schedule;
import com.xiang.common.enums.ScheduleEnums;
import com.xiang.common.factory.JntyzxDingTalkFactory;
import com.xiang.common.factory.schedule.BaseScheduleTaskTemplate;
import com.xiang.common.manage.jntyzx.zlb.IZlbJlUserInfoManage;
import com.xiang.common.manage.jntyzx.zlb.ZlbTokenInfoService;
import com.xiang.common.pojo.schedule.TaskResult;
import com.xiang.common.service.IScheduleOpeningConfigService;
import com.xiang.common.service.IScheduleRunLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* zlb场地捡漏任务
*
* @Author: xiang
* @Date: 2026-05-12 09:16
*/
@Component
@Slf4j
public class ZlbJlTask extends BaseScheduleTaskTemplate {
private final ZlbTokenInfoService zlbTokenInfoService;
private final JntyzxDingTalkFactory jntyzxDingTalkFactory;
private final IZlbJlUserInfoManage zlbJlUserInfoManage;
public ZlbJlTask(IScheduleOpeningConfigService scheduleOpeningConfigService,
IScheduleRunLogService scheduleRunLogService,
ZlbTokenInfoService zlbTokenInfoService,
JntyzxDingTalkFactory jntyzxDingTalkFactory,
IZlbJlUserInfoManage zlbJlUserInfoManage) {
super(scheduleOpeningConfigService, scheduleRunLogService);
this.zlbTokenInfoService = zlbTokenInfoService;
this.jntyzxDingTalkFactory = jntyzxDingTalkFactory;
this.zlbJlUserInfoManage = zlbJlUserInfoManage;
}
@Override
protected String getTaskName() {
return ScheduleEnums.ZLB_ORDER_JL_TASK.getTaskName();
}
@Override
protected Integer getModule() {
return ScheduleEnums.ZLB_ORDER_JL_TASK.getModuleCode();
}
@Override
protected String getModuleName() {
return ScheduleEnums.ZLB_ORDER_JL_TASK.getModule();
}
@Override
protected TaskResult doExecute(Object validatedParams) throws Exception {
// TaskResult taskResult = new TaskResult();
// taskResult.setSuccess(Boolean.TRUE);
// List<ZlbJlUserInfo> jlUsers = zlbJlUserInfoManage.getJlUsers();
// if (CollectionUtils.isEmpty(jlUsers)) {
// taskResult.setParams("暂无配置捡漏用户");
// return taskResult;
// }
//
// List<ZlbTokenInfo> allUsers = zlbTokenInfoService.getAllUsers();
// if (CollectionUtils.isEmpty(allUsers)) {
// taskResult.setParams("用户信息为空");
// return taskResult;
// }
// Map<String, ZlbTokenInfo> userMap = allUsers.stream().collect(Collectors.toMap(ZlbTokenInfo::getName, Function.identity(), (a, b) -> a));
// for (ZlbJlUserInfo jlUser : jlUsers) {
// if (userMap.containsKey(jlUser.getName())) {
//
// }
// }
return null;
}
}

View File

@@ -0,0 +1,117 @@
package com.xiang.service.module.jntyzx.zlb.schedule;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.Lists;
import com.xiang.common.enums.ScheduleEnums;
import com.xiang.common.factory.schedule.BaseScheduleTaskTemplate;
import com.xiang.common.manage.jntyzx.zlb.IZlbOrderInfoManage;
import com.xiang.common.manage.jntyzx.zlb.ZlbTokenInfoService;
import com.xiang.common.pojo.jntyzx.zlb.ZlbOrderDetailResp;
import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
import com.xiang.common.pojo.jntyzx.zlb.ZlbTokenInfo;
import com.xiang.common.pojo.schedule.TaskResult;
import com.xiang.common.service.IScheduleOpeningConfigService;
import com.xiang.common.service.IScheduleRunLogService;
import com.xiang.common.utils.OkHttpUtil;
import com.xiang.service.module.jntyzx.zlb.constants.ZlbUrlConstants;
import com.xiang.service.module.jntyzx.zlb.service.ZlbService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @Author: xiang
* @Date: 2026-05-11 09:11
*/
@Component
@Slf4j
public class ZlbOrderQueryTask extends BaseScheduleTaskTemplate {
private final IZlbOrderInfoManage zlbOrderInfoManage;
private final ZlbTokenInfoService zlbTokenInfoService;
private final ZlbService zlbService;
public ZlbOrderQueryTask(IScheduleOpeningConfigService scheduleOpeningConfigService,
IScheduleRunLogService scheduleRunLogService,
IZlbOrderInfoManage zlbOrderInfoManage,
ZlbTokenInfoService zlbTokenInfoService, ZlbService zlbService) {
super(scheduleOpeningConfigService, scheduleRunLogService);
this.zlbOrderInfoManage = zlbOrderInfoManage;
this.zlbTokenInfoService = zlbTokenInfoService;
this.zlbService = zlbService;
}
@Override
protected String getTaskName() {
return ScheduleEnums.ZLB_ORDER_QUERY_TASK.getTaskName();
}
@Override
protected Integer getModule() {
return ScheduleEnums.ZLB_ORDER_QUERY_TASK.getModuleCode();
}
@Override
protected String getModuleName() {
return ScheduleEnums.ZLB_ORDER_QUERY_TASK.getModule();
}
@Override
protected TaskResult doExecute(Object validatedParams) throws Exception {
TaskResult taskResult = new TaskResult();
taskResult.setSuccess(Boolean.TRUE);
List<ZlbPayOrder> orders = zlbOrderInfoManage.queryOrder(LocalDate.now().plusDays(1));
if (CollectionUtils.isEmpty(orders)) {
taskResult.setSummary("无可使用的订单");
return taskResult;
}
List<ZlbTokenInfo> users = zlbTokenInfoService.getAllUsers();
if (CollectionUtils.isEmpty(users)) {
taskResult.setSummary("无可使用的用户");
return taskResult;
}
Map<String, ZlbTokenInfo> userMap = users.stream().collect(Collectors.toMap(ZlbTokenInfo::getName, Function.identity(), (a, b) -> a));
OkHttpUtil client = OkHttpUtil.getInstance();
List<ZlbPayOrder> result = Lists.newArrayList();
for (ZlbPayOrder order : orders) {
if (!userMap.containsKey(order.getName())) {
continue;
}
ZlbTokenInfo zlbTokenInfo = userMap.get(order.getName());
String orderDetailStr = client.postJson(String.format(ZlbUrlConstants.getOrderDetailUrl, order.getOrderId()), zlbService.getHeaders(zlbTokenInfo.getTokenId()),"{}");
if (StringUtils.isBlank(orderDetailStr)) {
log.info("订单:{}查询结果为空", order.getOrderId());
continue;
}
JSONObject jsonObject = JSON.parseObject(orderDetailStr);
ZlbOrderDetailResp data = JSON.parseObject(jsonObject.getString("data"), ZlbOrderDetailResp.class);
if (Objects.isNull(data)) {
continue;
}
if (Objects.equals(data.getState(), 2)) {
order.setIsPay(1);
result.add(order);
} else {
order.setIsPay(2);
result.add(order);
}
}
if (CollectionUtils.isNotEmpty(result)) {
zlbOrderInfoManage.updateBatchById(result);
}
taskResult.setSummary("订单查询成功!");
return taskResult;
}
}

View File

@@ -8,6 +8,8 @@ import com.xiang.common.enums.ScheduleEnums;
import com.xiang.common.exception.BusinessException;
import com.xiang.common.factory.JntyzxDingTalkFactory;
import com.xiang.common.factory.schedule.BaseScheduleTaskTemplate;
import com.xiang.common.manage.jntyzx.zlb.IZlbOrderInfoManage;
import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
import com.xiang.common.pojo.jntyzx.zlb.ZlbTokenInfo;
import com.xiang.common.pojo.jntyzx.zlb.ZlbUserInfo;
import com.xiang.common.pojo.schedule.TaskResult;
@@ -24,6 +26,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.Date;
import java.util.Map;
@@ -40,6 +43,7 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
private final ZlbTokenInfoService zlbTokenInfoService;
private final JntyzxDingTalkFactory jntyzxDingTalkFactory;
private final RedisTemplate redisTemplate;
private final IZlbOrderInfoManage zlbOrderInfoManage;
public ZlbOrderTask(IScheduleOpeningConfigService scheduleOpeningConfigService,
IScheduleRunLogService scheduleRunLogService,
@@ -47,13 +51,15 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
ZlbService zlbService,
ZlbTokenInfoService zlbTokenInfoService,
JntyzxDingTalkFactory jntyzxDingTalkFactory,
RedisTemplate redisTemplate) {
RedisTemplate redisTemplate,
IZlbOrderInfoManage zlbOrderInfoManage) {
super(scheduleOpeningConfigService, scheduleRunLogService);
this.zlbUserInfoService = zlbUserInfoService;
this.zlbService = zlbService;
this.zlbTokenInfoService = zlbTokenInfoService;
this.jntyzxDingTalkFactory = jntyzxDingTalkFactory;
this.redisTemplate = redisTemplate;
this.zlbOrderInfoManage = zlbOrderInfoManage;
}
@Override
@@ -98,11 +104,15 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
String tokenId = zlbTokenInfo.getTokenId();
String secretKey = zlbService.getKey(tokenId, client);
String siteOrderDetailsStr = zlbService.buildSiteOrder(zlbUserInfo, secretKey, day);
if (StringUtils.isEmpty(siteOrderDetailsStr)) {
log.info("构建订单参数异常:{}", siteOrderDetailsStr);
throw new BusinessException("构建订单参数异常");
}
Map<String, String> headers = zlbService.getHeaders(zlbTokenInfo.getTokenId());
String newOrderJson = zlbService.buildNewOrder(siteOrderDetailsStr, client);
if (StringUtils.isBlank(newOrderJson)) {
log.info("构建订单参数异常:{}", siteOrderDetailsStr);
throw new BusinessException("");
throw new BusinessException("构建订单参数异常");
}
ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
//计算9点到现在的时间差
@@ -138,18 +148,27 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
log.info("订单接口返回结果==> \n {}", response);
JSONObject jsonObject = JSONObject.parseObject(response);
if (jsonObject.getInteger("code") == 200) {
jntyzxDingTalkFactory.sendMsg(name + "zlb订单接口下单返回成功请2分钟内付款√√√√√√场地号:" + placeName + "时间:" + siteTimeName);
jntyzxDingTalkFactory.sendMsg(name + ":zlb订单接口下单返回成功请2分钟内付款√√√√√√场地号:" + placeName + "时间:" + siteTimeName);
JSONObject data = jsonObject.getJSONObject("data");
String orderId = data.getString("orderId");
log.info("{}订单{}创建成功", name, orderId);
String redisKey = ZlbUrlConstants.REDIS_PREFIX + "_" + orderId + "_" + name;
redisTemplate.opsForValue().set(redisKey, name);
redisTemplate.expire(redisKey, 120, TimeUnit.SECONDS);
ZlbPayOrder zlbPayOrder = new ZlbPayOrder();
zlbPayOrder.setName(name);
zlbPayOrder.setOrderId(orderId);
zlbPayOrder.setDay(DateUtils.getDateFromDate(LocalDate.now().plusDays(1)));
zlbPayOrder.setVenues("江体");
zlbPayOrder.setPlaceName(placeName);
zlbPayOrder.setTime(siteTimeName);
zlbPayOrder.setIsPay(0);
zlbOrderInfoManage.save(zlbPayOrder);
return true;
}
if (jsonObject.getInteger("code") == 500) {
if (jsonObject.getString("message").contains("已被售出")) {
jntyzxDingTalkFactory.sendMsg(name + "zlb订单接口下单返回失败❌❌❌场地号:" + placeName + "已被售出");
jntyzxDingTalkFactory.sendMsg(name + ":zlb订单接口下单返回失败❌❌❌场地号:" + placeName + "已被售出");
return true;
}
}

View File

@@ -56,6 +56,7 @@ public class ZlbSiteDayTask extends BaseScheduleTaskTemplate {
String day = DateUtils.format(date, DateUtils.ENUM_FORMAT_YMD);
LambdaQueryWrapper<ZlbPayOrder> wrapper = Wrappers.lambdaQuery();
wrapper.eq(ZlbPayOrder::getDay, day);
wrapper.eq(ZlbPayOrder::getIsPay, 1);
wrapper.orderByAsc(ZlbPayOrder::getTime);
List<ZlbPayOrder> zlbPayOrders = zlbOrderInfoMapper.selectList(wrapper);
if (!zlbPayOrders.isEmpty()){

View File

@@ -17,11 +17,12 @@ public class ZlbTaskConfig {
private final ZlbSiteDayTask zlbSiteDayTask;
private final ZlbOrderTask zlbOrderTask;
private final ZlbUserConfigTask zlbUserConfigTask;
private final ZlbOrderQueryTask zlbOrderQueryTask;
/**
* token续期
*/
@Scheduled(cron = "0 0/30 * * * ?")
@Scheduled(cron = "0 10,40 * * * ?")
@GetMapping("/zlbLoginTask")
public void zlbLoginTask() {
zlbLoginTask.run();
@@ -71,4 +72,13 @@ public class ZlbTaskConfig {
public void zlbUserConfig() {
zlbUserConfigTask.run();
}
/**
* 9:05查询订单是否已经支付
*/
@Scheduled(cron = "0 5 9 * * ?")
@GetMapping("/zlbOrderQueryTask")
public void zlbOrderQueryTask() {
zlbOrderQueryTask.run();
}
}

View File

@@ -0,0 +1,42 @@
package com.xiang.service.module.jntyzx.zlb.server;
import com.xiang.service.module.jntyzx.zlb.service.ZlbService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* @Author: xiang
* @Date: 2026-05-12 09:27
*/
@Slf4j
@RestController
@RequiredArgsConstructor
public class JtZlbController {
private final ZlbService zlbService;
private static final ExecutorService executorService = Executors.newFixedThreadPool(1);
@GetMapping("/token")
public void token(@RequestParam("name") String name, @RequestParam("token") String token) throws Exception {
zlbService.token(token, name);
}
@GetMapping("/zlbJl")
public void zlbJlTask(@RequestParam("name") String name, @RequestParam("date") String date, @RequestParam("time") String time, @RequestParam("interval") Long interval) throws Exception {
log.info("[zlbJl] zlb自定义捡漏任务启动用户:{}, 时间:{}", name, date);
executorService.submit(() -> {
try {
zlbService.jianlou(name, date, time, interval);
} catch (Exception e) {
throw new RuntimeException(e);
}
});
}
}

View File

@@ -14,30 +14,20 @@ import java.util.Map;
* @Description***
*/
public interface ZlbService {
void queryZLbSiteInfo(String ymdDate,Integer type) throws Exception;
void queryZLbSiteInfo(String ymdDate, Integer type) throws Exception;
String getKey(String tokenId, OkHttpUtil client) throws IOException;
void testJs(String token, String name) throws IOException;
void token(String token, String name) throws IOException;
Map<String, String> getHeaders(String tokenId);
String buildSiteOrder(ZlbUserInfo zlbUserInfo, String secretKey, String day) throws Exception;
void createOrder(ZlbUserInfo zlbUserInfo) throws Exception;
String createOrderWq(ZlbUserInfo zlbUserInfo) throws Exception;
String buildNewOrder(String siteOrderDetailsStr, OkHttpUtil client) throws IOException;
void deleteRedis(String name);
void installRedis(String name);
void jianlou(String name, String day, String time, long interval) throws Exception;
void jianlou(String name, String day,long time) throws Exception;
void refundOrder(String refundName, String day) throws Exception;
void cancelOrder(String cancelName, String day) throws Exception;
}

View File

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.xiang.common.factory.JntyzxDingTalkFactory;
import com.xiang.common.manage.jntyzx.zlb.ZlbSiteInfoService;
import com.xiang.common.manage.jntyzx.zlb.ZlbTokenInfoService;
import com.xiang.common.manage.jntyzx.zlb.ZlbUserInfoService;
import com.xiang.common.pojo.jntyzx.zlb.ZlbCaptchaResp;
import com.xiang.common.pojo.jntyzx.zlb.ZlbOrderInfo;
import com.xiang.common.pojo.jntyzx.zlb.ZlbOrderJson;
@@ -24,7 +23,6 @@ import com.xiang.common.pojo.jntyzx.zlb.ZlbUserInfo;
import com.xiang.common.service.ICodeService;
import com.xiang.common.utils.AESECBUtils;
import com.xiang.common.utils.Base64ImageScaler;
import com.xiang.common.utils.DateUtils;
import com.xiang.common.utils.OkHttpUtil;
import com.xiang.common.utils.ZlbCaptchaTrackUtil;
import com.xiang.service.module.jntyzx.zlb.constants.ZlbUrlConstants;
@@ -62,8 +60,6 @@ public class ZlbServiceImpl implements ZlbService {
@Autowired
private JntyzxDingTalkFactory jntyzxDingTalkFactory;
@Autowired
private ZlbUserInfoService zlbUserInfoService;
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private ICodeService codeService;
@@ -219,34 +215,6 @@ public class ZlbServiceImpl implements ZlbService {
return "";
}
@Override
public void createOrder(ZlbUserInfo zlbUserInfo) throws Exception {
Date date = DateUtils.addDate(new Date(), 1);
String day = DateUtils.format(date, DateUtils.ENUM_FORMAT_YMD);
String name = zlbUserInfo.getName();
String placeName = zlbUserInfo.getPlaceName();
String siteTimeName = zlbUserInfo.getSiteTimeName();
//获取Token
ZlbTokenInfo zlbTokenInfo = zlbTokenInfoService.queryByName(name);
OkHttpUtil client = OkHttpUtil.getInstance();
String tokenId = zlbTokenInfo.getTokenId();
String secretKey = getKey(tokenId, client);
//组装场地信息
String siteOrderDetailsStr = buildSiteOrder(zlbUserInfo, secretKey, day);
//加密
for (int i = 1; i < 12; i++) {
String response1 = sendOrder(siteOrderDetailsStr, zlbTokenInfo.getTokenId(), client);
String str = buildOrder(name, response1, placeName, siteTimeName);
if ("下单成功".equals(str)) {
return;
}
if ("您选择场地已被售出".equals(str)) {
return;
}
}
}
public String buildOrder(String name, String response, String placeName, String siteTimeName) throws InterruptedException {
String orderId = "";
log.info("订单接口返回结果==> \n {}", response);
@@ -280,51 +248,6 @@ public class ZlbServiceImpl implements ZlbService {
return orderId;
}
@Override
public String createOrderWq(ZlbUserInfo zlbUserInfo) throws Exception {
String orderId = "";
Date date = DateUtils.addDate(new Date(), 3);
String day = DateUtils.format(date, DateUtils.ENUM_FORMAT_YMD);
String name = zlbUserInfo.getName();
String placeName = zlbUserInfo.getPlaceName();
String siteTimeName = zlbUserInfo.getSiteTimeName();
//获取Token
ZlbTokenInfo zlbTokenInfo = zlbTokenInfoService.queryByName(name);
String siteOrderDetailsStr = buildSiteOrderList(zlbUserInfo, zlbTokenInfo.getSecretKey(), day);
//组装参数加密
for (int i = 1; i < 10; i++) {
String response = sendOrderWq(siteOrderDetailsStr, zlbTokenInfo.getTokenId());
log.info("订单接口返回结果==> \n {}", response);
JSONObject jsonObject = JSONObject.parseObject(response);
if (jsonObject.getInteger("code") == 200) {
jntyzxDingTalkFactory.sendMsg(name + "订单接口下单返回成功请2分钟内付款√√√√√√场地号:" + placeName + "时间:" + siteTimeName);
JSONObject data = jsonObject.getJSONObject("data");
orderId = data.getString("orderId");
return orderId;
} else if (response.contains("下单失败")) {
jntyzxDingTalkFactory.sendMsg(response);
return "";
} else if (response.contains("场地不在可售时间内")) {
jntyzxDingTalkFactory.sendMsg(response);
return "";
} else if (response.contains("您选择场地已被售出")) {
jntyzxDingTalkFactory.sendMsg(name + "订单接口下单返回失败 \n" + response);
return "";
} else if (response.contains("此票超过用户每日订场次数")) {
jntyzxDingTalkFactory.sendMsg(name + "订单接口下单返回失败 \n" + response);
return "";
} else if (response.contains("您有一笔待支付的订场订单")) {
jntyzxDingTalkFactory.sendMsg(name + "订单接口下单返回失败 \n" + response);
Thread.sleep(1500);
} else if (response.contains("场地火爆")) {
log.info("{}场地火爆下单返回失败暂停1s下单 \n{}", name, response);
Thread.sleep(200);
} else {
jntyzxDingTalkFactory.sendMsg(name + "订单接口下单返回失败请检查日志重试第" + i + "次××××××==> \n" + response);
}
}
return orderId;
}
private String sendOrderWq(String siteOrderDetailsStr, String tokenId) throws IOException {
OkHttpUtil client = OkHttpUtil.getInstance();
@@ -450,15 +373,8 @@ public class ZlbServiceImpl implements ZlbService {
}
@Override
public void installRedis(String name) {
String redisKey = ZlbUrlConstants.REDIS_PREFIX + "_" + 123456 + "_" + name;
redisTemplate.opsForValue().set(redisKey, name);
redisTemplate.expire(redisKey, 1234, TimeUnit.SECONDS);
}
@Override
public void jianlou(String name, String day, long time) throws Exception {
jntyzxDingTalkFactory.sendMsg(name + "自定义捡漏开始捡漏时间:" + day + " 捡漏人:" + name + " 捡漏间隔:" + time + "ms");
public void jianlou(String name, String day, String time, long interval) throws Exception {
jntyzxDingTalkFactory.sendMsg(name + "自定义捡漏开始捡漏时间:" + day + " 捡漏人:" + name + " 捡漏间隔:" + interval + "ms");
//获取Token
ZlbTokenInfo zlbTokenInfo = zlbTokenInfoService.queryByName(name);
String tokenId = zlbTokenInfo.getTokenId();
@@ -490,12 +406,15 @@ public class ZlbServiceImpl implements ZlbService {
if (StringUtils.isEmpty(siteInfo)) {
return;
}
// log.info("请求场地返回信息: \n {}", siteInfo);
// log.info("请求场地返回信息: \n {}", siteInfo);
jsonObject = JSONObject.parseObject(siteInfo);
JSONObject data = jsonObject.getJSONObject("data");
String listString = data.getString("list");
zlbSiteInfos = JSONArray.parseArray(listString, ZlbSiteInfo.class);
for (ZlbSiteInfo zlbSiteInfo : zlbSiteInfos) {
if (!StringUtils.equals(zlbSiteInfo.getDayEffectiveTimes(), time)) {
continue;
}
Integer ticketType = zlbSiteInfo.getTicketType();
if (ticketType == 1) {//代表可以抢的场地号
jntyzxDingTalkFactory.sendMsg(day + "ZLb捡漏发现场地:" + zlbSiteInfo.getPlaceName() + "时间点:" + zlbSiteInfo.getDayEffectiveTimes());
@@ -539,7 +458,7 @@ public class ZlbServiceImpl implements ZlbService {
startTime = System.currentTimeMillis();
}
//休息5s
Thread.sleep(time);
Thread.sleep(interval);
} catch (Exception e) {
log.error("请求场地信息异常:{}", e.getMessage());
jntyzxDingTalkFactory.sendMsg(name + "ZLb自定义捡漏异常请查看日志");
@@ -551,91 +470,6 @@ public class ZlbServiceImpl implements ZlbService {
jntyzxDingTalkFactory.sendMsg("自定义捡漏结束");
}
@Override
public void refundOrder(String refundName, String day) throws Exception {
//找到退款人的token
ZlbTokenInfo zlbTokenInfo = zlbTokenInfoService.getOne(new LambdaQueryWrapper<ZlbTokenInfo>().eq(ZlbTokenInfo::getName, refundName));
if (zlbTokenInfo == null) {
jntyzxDingTalkFactory.sendMsg("退款失败,请检查是否录入退款人登录信息-->" + refundName);
}
OkHttpUtil client = OkHttpUtil.getInstance();
//获取退款人的订单列表
String s = client.postJson(ZlbUrlConstants.getOrderInfoUrl, getHeaders(zlbTokenInfo.getTokenId()), "{\"curPage\":1,\"maxPage\":10,\"state\":2,\"type\":2}");
log.info("{}订单列表==> \n {}", refundName, s);
//获取当前日期下的orderId
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
if (data.getInteger("total").equals(0)) {
jntyzxDingTalkFactory.sendMsg("退款失败,请检查是否存在待使用订单-->" + refundName);
return;
}
JSONArray list = data.getJSONArray("list");
for (int i = 0; i < list.size(); i++) {
JSONObject jsonObject1 = list.getJSONObject(i);
String orderId = jsonObject1.getString("orderId");
Integer stadiumId = jsonObject1.getInteger("stadiumId");
String validity = jsonObject1.getString("validity");
log.info("stadiumId:{} ,validity:{},orderId:{}", stadiumId, validity, orderId);
if (stadiumId.equals(49) && validity.contains(day)) {
//拿到订单详情
String orderDetailStr = client.postJson(String.format(ZlbUrlConstants.getOrderDetailUrl, orderId), getHeaders(zlbTokenInfo.getTokenId()), "{}");
log.info("{}订单详情==> \n {}", orderId, orderDetailStr);
JSONObject jsonObject2 = JSONObject.parseObject(orderDetailStr);
JSONObject data1 = jsonObject2.getJSONObject("data");
JSONArray ticketInfos = data1.getJSONArray("ticketInfos");
for (int j = 0; j < ticketInfos.size(); j++) {
JSONObject ticketInfo = ticketInfos.getJSONObject(j);
String detailOrderId = ticketInfo.getString("detailOrderId");
//取消订单
String cancelOrder = client.postJson(ZlbUrlConstants.getOrderRefundUrl, getHeaders(zlbTokenInfo.getTokenId()), String.format(ZlbUrlConstants.refundStr, orderId, detailOrderId));
log.info("{}退款订单==> \n {}", refundName, cancelOrder);
if (cancelOrder.contains("退款成功")) {
jntyzxDingTalkFactory.sendMsg(refundName + "退款成功");
}
}
}
}
}
@Override
public void cancelOrder(String cancelName, String day) throws Exception {
//找到取消人的token
ZlbTokenInfo zlbTokenInfo = zlbTokenInfoService.getOne(new LambdaQueryWrapper<ZlbTokenInfo>().eq(ZlbTokenInfo::getName, cancelName));
if (zlbTokenInfo == null) {
jntyzxDingTalkFactory.sendMsg("取消失败,请检查是否录入取消人登录信息-->" + cancelName);
}
OkHttpUtil client = OkHttpUtil.getInstance();
//获取取消人的订单列表
String s = client.postJson(ZlbUrlConstants.getOrderInfoUrl, getHeaders(zlbTokenInfo.getTokenId()), "{\"curPage\":1,\"maxPage\":10,\"state\":1,\"type\":2}");
log.info("{}订单列表==> \n {}", cancelName, s);
//获取当前日期下的orderId
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
if (data.getInteger("total").equals(0)) {
jntyzxDingTalkFactory.sendMsg("取消失败,请检查是否存在待使用订单-->" + cancelName);
return;
}
JSONArray list = data.getJSONArray("list");
for (int i = 0; i < list.size(); i++) {
JSONObject jsonObject1 = list.getJSONObject(i);
String orderId = jsonObject1.getString("orderId");
Integer stadiumId = jsonObject1.getInteger("stadiumId");
String validity = jsonObject1.getString("validity");
log.info("stadiumId:{} ,validity:{},orderId:{}", stadiumId, validity, orderId);
if (stadiumId.equals(49) && validity.contains(day)) {
//取消订单,并直接删除redis相关信息
String cancelOrder = client.postJson(ZlbUrlConstants.getOrderCancelUrl, getHeaders(zlbTokenInfo.getTokenId()), String.format(ZlbUrlConstants.cancelStr, orderId));
deleteRedis(orderId);
log.info("{}取消订单==> \n {}", cancelName, cancelOrder);
if (cancelOrder.contains("取消成功")) {
jntyzxDingTalkFactory.sendMsg(cancelName + "取消成功");
}
}
}
}
private String sendPost(OkHttpUtil client, Map<String, String> headers, String encrypt) throws IOException {
String newOrderJson = buildNewOrder(encrypt, client);
String response = null;
@@ -649,7 +483,7 @@ public class ZlbServiceImpl implements ZlbService {
}
@Override
public void testJs(String token, String name) throws IOException {
public void token(String token, String name) throws IOException {
log.info("获取到name:{},token:{}", name, token);
LambdaQueryWrapper<ZlbTokenInfo> wrapper = Wrappers.lambdaQuery();
wrapper.eq(ZlbTokenInfo::getName, name);

View File

@@ -2,7 +2,7 @@
<configuration scan="true">
<!-- 应用名称:和统一配置中的项目代码保持一致(小写) -->
<springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="X_APP" />
<springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="APP" />
<contextName>${APP_NAME}</contextName>
<!--日志文件保留天数 -->
@@ -65,6 +65,23 @@
</filter>
</appender>
<appender name="APP_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_HOME}/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
<MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 按照每天生成日志文件:主项目日志 -->
<appender name="APP_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -90,12 +107,12 @@
<root level="INFO">
<appender-ref ref="APP_DEBUG"/>
<appender-ref ref="APP_INFO"/>
<appender-ref ref="APP_WARN"/>
<appender-ref ref="APP_ERROR"/>
<appender-ref ref="CONSOLE"/>
</root>
<!-- mybatis 日志级别 -->
<logger name="com.xiang" level="INFO"/>
<logger name="com.xiang" level="DEBUG"/>
<!-- Spring 框架 -->
<logger name="org.springframework" level="INFO"/>