diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java index 5c2ad6c..7b4e62d 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java @@ -78,7 +78,7 @@ public class FwdImportantMsgJob { List taskList = dynamicTaskSchedulerService.getTaskList(scheduledTaskEntity); for (ScheduledTaskEntity taskEntity : taskList) { HashMap params = com.alibaba.fastjson2.JSON.parseObject(taskEntity.getParameters(), HashMap.class); - FwdOrderTaskParam param = MapUtils.isEmpty(params) ? new FwdOrderTaskParam(null, taskEntity.getId()) : new FwdOrderTaskParam((Long) params.get("projectId"), taskEntity.getId()); + FwdOrderTaskParam param = MapUtils.isEmpty(params) ? new FwdOrderTaskParam(null, taskEntity.getId()) : new FwdOrderTaskParam(Long.parseLong(params.get("projectId").toString()), taskEntity.getId()); LocalDateTime runTime = taskEntity.getRunTime().isBefore(TimeSyncUtils.now()) ? TimeSyncUtils.now() : taskEntity.getRunTime(); dynamicTaskScheduler.schedule( new TaskConfig(taskEntity.getId(), taskEntity.getTaskName(), taskEntity.getTaskGroup(), runTime, params), diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java index 33ba4f3..6591d81 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java @@ -130,98 +130,6 @@ public class PerformServiceImpl implements IPerformService { } dingTalkService.sendScriptMsg("【芬玩岛】下单失败❌❌❌,演出名称:" + performByProjectId.getProjectName()); return Boolean.FALSE; -// Map> performMap = seatInfoByProjectId.stream().filter(item -> 0 == item.getSoldOut()).collect(Collectors.groupingBy(FPerformSeatInfo::getPerformId)); -// for (Long performId : performMap.keySet()) { -// List fPerformSeatInfos = performMap.get(performId); -// AtomicReference atomicPrice = new AtomicReference<>(); -// fPerformSeatInfos.stream().map(FPerformSeatInfo::getPrice).max(BigDecimal::compareTo).ifPresent(atomicPrice::set); -// BigDecimal price = atomicPrice.get(); -// if (Objects.isNull(price)) {continue;} -// Map seatInfoMap = fPerformSeatInfos.stream().collect(Collectors.toMap(FPerformSeatInfo::getSeatPlanId, Function.identity(), (a, b) -> a)); -// Map> seatResult = Maps.newHashMap(); -// seatResult.put(0, Lists.newArrayList()); -// seatResult.put(1, Lists.newArrayList()); -// seatResult.put(2, Lists.newArrayList()); -// seatResult.put(3, Lists.newArrayList()); -// seatResult.put(4, Lists.newArrayList()); -// List seats = Lists.newArrayList(); -// for (Long seatInfoId : seatInfoMap.keySet()) { -// /* -// 0: 600-900 -// 1: 900-1300 -// 2: 1300-1600 -// 3: >1600 -// 4: <=600 -// */ -// FPerformSeatInfo fPerformSeatInfo = seatInfoMap.get(seatInfoId); -// if (fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(600)) > 0 && fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(900)) <= 0) { -// List temp = seatResult.get(0); -// temp.add(fPerformSeatInfo); -// seatResult.put(0, temp); -// } -// if (fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(900)) > 0 && fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(1300)) <= 0) { -// List temp = seatResult.get(1); -// temp.add(fPerformSeatInfo); -// seatResult.put(1, temp); -// } -// if (fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(1300)) > 0 && fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(1600)) <= 0) { -// List temp = seatResult.get(2); -// temp.add(fPerformSeatInfo); -// seatResult.put(2, temp); -// } -// if (fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(1600)) >= 0) { -// List temp = seatResult.get(3); -// temp.add(fPerformSeatInfo); -// seatResult.put(3, temp); -// } -// if (fPerformSeatInfo.getPrice().compareTo(BigDecimal.valueOf(600)) <= 0) { -// List temp = seatResult.get(4); -// temp.add(fPerformSeatInfo); -// seatResult.put(4, temp); -// } -// } -// List seat0 = seatResult.get(0); -// List seat1 = seatResult.get(1); -// List seat2 = seatResult.get(2); -// List seat3 = seatResult.get(3); -// List seat4 = seatResult.get(4); -// seats.addAll(seat0); -// seats.addAll(seat1); -// seats.addAll(seat2); -// seats.addAll(seat3); -// seats.addAll(seat4); -// List seatIds = seats.stream().map(FPerformSeatInfo::getSeatPlanId).toList(); -// ProjectOrderCreateReq projectOrderCreateReq = buildReqV2(projectId, frequentIds, seatIds, performId, price); -// for (int i = 1; i <= 10; i++) { -// ProjectOrderCreateResp projectOrder = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.createProjectOrder(projectOrderCreateReq, availableUser.get(0).getToken()), "create-project-order"); -// if (Objects.nonNull(projectOrder)) { -// log.info("下单成功,订单信息:{}", JSONObject.toJSONString(projectOrder)); -// String msg = "【芬玩岛】下单成功✅✅✅,演出名称:" + performByProjectId.getProjectName() + ",请在2分钟内完成付款!"; -// dingTalkService.sendScriptMsg(msg); -// return Boolean.TRUE; -// } -// } -// dingTalkService.sendScriptMsg("【芬玩岛】下单失败❌❌❌,演出名称:" + performByProjectId.getProjectName()); -// return Boolean.FALSE; -// } - -// for (FPerformSeatInfo fPerformSeatInfo : seatInfoByProjectId) { -// if (1 == fPerformSeatInfo.getSoldOut()) { -// continue; -// } -// ProjectOrderCreateReq projectOrderCreateReq = buildReq(projectId, frequentIds, fPerformSeatInfo); -// for (int i = 1; i <= 10; i++) { -// ProjectOrderCreateResp projectOrder = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.createProjectOrder(projectOrderCreateReq, availableUser.get(0).getToken()), "create-project-order"); -// if (Objects.nonNull(projectOrder)) { -// log.info("下单成功,订单信息:{}", JSONObject.toJSONString(projectOrder)); -// String msg = "【芬玩岛】下单成功✅✅✅,演出名称:" + performByProjectId.getProjectName() + ",请在2分钟内完成付款!"; -// dingTalkService.sendScriptMsg(msg); -// return Boolean.TRUE; -// } -// } -// } -// dingTalkService.sendScriptMsg("【芬玩岛】下单失败❌❌❌,演出名称:" + performByProjectId.getProjectName()); -// return Boolean.FALSE; } @NotNull