diff --git a/pom.xml b/pom.xml
index 287aa46..a194a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
pom
script
+ sda_stock_center
diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java
index ccc5150..4389363 100644
--- a/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java
+++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/constants/UrlConstants.java
@@ -2,8 +2,6 @@ package com.xiang.xservice.application.script.fwd.constants;
public class UrlConstants {
- public static final String token = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJjdCI6MTc1MjYzODAwNTUxNywic3ViIjoiTDIxMTQzMjU2NDEiLCJhdWQiOiJMSVZFTEFCIiwiaXNzIjoiVElDS0VUIiwibWlkIjoxNzU4ODA4NTcxMzgzNjcxNTUzLCJ0eXBlIjoiYXBwbGV0IiwiaWF0IjoxNzUyNjM4MDA1LCJkaWQiOiI2RTRDMDQ5RS00RkFBLTQ0NDMtQjI3NC1DNjRBMjZEMUFGNTkiLCJrZXkiOiJMSVZFTEFCIn0.iw1u3LyCYlxYCI1gMwTeuJlPdv-rQKCVlO2ySF_UrJ-lrEH6fm5lGo4wGalLn1qGkyqZaxuTx1K6X7Oy7sHgBA";
-
/**
* 芬玩岛的基础URL
*/
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 7b4e62d..495bf7f 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
@@ -3,6 +3,7 @@ package com.xiang.xservice.application.script.fwd.schedule;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps;
+import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig;
import com.xiang.xservice.basic.utils.DateUtils;
import com.xiang.xservice.basic.utils.PrimaryKeyUtils;
import com.xiang.xservice.application.script.fwd.entity.param.FwdOrderTaskParam;
@@ -139,6 +140,9 @@ public class FwdImportantMsgJob {
@PostMapping("/presaleSeatReminderJob")
public void presaleSeatReminderJob() {
+ List availableUser = fwdUserConfigMapper.getAvailableUser();
+ String token = availableUser.get(0).getToken();
+
ScheduledTaskEntity entity = new ScheduledTaskEntity();
entity.setStatus(TaskStatusEnum.UN_START.getCode());
List taskList = dynamicTaskSchedulerService.getTaskList(entity);
@@ -162,7 +166,7 @@ public class FwdImportantMsgJob {
log.error("异常错误信息:{}", JSON.toJSONString(taskEntity), e);
}
if (Objects.nonNull(projectId)) {
- Perform performsByProjectIdFromHttp = iPerformServiceHttp.getPerformsByProjectIdFromHttp(projectId);
+ Perform performsByProjectIdFromHttp = iPerformServiceHttp.getPerformsByProjectIdFromHttp(projectId, token);
if (Objects.nonNull(performsByProjectIdFromHttp)) {
for (PerformInfo performInfo : performsByProjectIdFromHttp.getPerformInfos()) {
for (PerformDetail performDetail : performInfo.getPerformInfo()) {
@@ -171,7 +175,7 @@ public class FwdImportantMsgJob {
List seatPlans = performDetail.getSeatPlans();
Map seatPlanMap = seatPlans.stream().collect(Collectors.toMap(SeatPlan::getSeatPlanId, Function.identity(), (a, b) -> a));
List seatPlanIds = seatPlans.stream().map(SeatPlan::getSeatPlanId).collect(Collectors.toList());
- List seatPlanStatusFromHttp = iPerformServiceHttp.getSeatPlanStatusFromHttp(seatPlanIds);
+ List seatPlanStatusFromHttp = iPerformServiceHttp.getSeatPlanStatusFromHttp(seatPlanIds, token);
for (SeatPlanStatus seatPlanStatus : seatPlanStatusFromHttp) {
if (!seatPlanStatus.getSoldOutFlag()) {
FPerformSeatInfo seatInfoBySeatId = iPerformService.getSeatInfoBySeatId(seatPlanStatus.getSeatPlanId());
diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java
index 1b5e4f3..ca3ea3d 100644
--- a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java
+++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java
@@ -1,9 +1,6 @@
package com.xiang.xservice.application.script.fwd.schedule;
import com.google.common.collect.Lists;
-import com.xiang.xservice.basic.common.req.BaseRequest;
-import com.xiang.xservice.basic.config.MyThreadFactory;
-import com.xiang.xservice.basic.utils.DateUtils;
import com.xiang.xservice.application.script.fwd.entity.pojo.FAudienceConfig;
import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo;
import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo;
@@ -23,6 +20,10 @@ import com.xiang.xservice.application.script.fwd.mapper.FwdPerformProjectInfoMap
import com.xiang.xservice.application.script.fwd.mapper.FwdPerformSeatInfoMapper;
import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper;
import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp;
+import com.xiang.xservice.basic.common.req.BaseRequest;
+import com.xiang.xservice.basic.config.MyThreadFactory;
+import com.xiang.xservice.basic.utils.DateUtils;
+import com.xiang.xservice.basic.utils.RandomCodeUtils;
import com.xiang.xservice.http.helper.HttpRequestHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -36,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -139,6 +139,8 @@ public class PullDataFromFWDJob {
@Scheduled(cron = "0 0 1 1/1 * ?")
public void pullPerformDataJobV2() {
int pageNum = 0;
+ List availableUser = userConfigMapper.getAvailableUser();
+ String token = availableUser.get(0).getToken();
while (true) {
pageNum++;
BaseRequest baseRequest = new BaseRequest();
@@ -149,12 +151,12 @@ public class PullDataFromFWDJob {
break;
}
List projects = projectsResp.getList();
- List> futures = Lists.newArrayList();
+ List results = Lists.newArrayList();
for (ProjectList project : projects) {
- CompletableFuture future = CompletableFuture.supplyAsync(() -> handleProjectData(project), es);
- futures.add(future);
+ FPerformProjectInfo performProjectInfo = handleProjectData(project, token);
+ results.add(performProjectInfo);
}
- List results = futures.stream().map(CompletableFuture::join).toList();
+ results = results.stream().filter(Objects::nonNull).toList();
// 查询演出座位档次信息
List insertList = Lists.newCopyOnWriteArrayList();
List updateList = Lists.newCopyOnWriteArrayList();
@@ -164,7 +166,7 @@ public class PullDataFromFWDJob {
continue;
}
List seatPlanIds = seatPlans.stream().map(SeatPlan::getSeatPlanId).toList();
- List seatPlanStatusList = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getSeatPlanStatusFromHttp(seatPlanIds), "fetch-seat-plan-status");
+ List seatPlanStatusList = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getSeatPlanStatusFromHttp(seatPlanIds, token), "fetch-seat-plan-status");
if (CollectionUtils.isEmpty(seatPlanStatusList)) {
continue;
}
@@ -186,6 +188,7 @@ public class PullDataFromFWDJob {
}
}
}
+ stopThread();
}
if (!CollectionUtils.isEmpty(insertList)) {
performSeatInfoMapper.batchSave(insertList);
@@ -198,14 +201,14 @@ public class PullDataFromFWDJob {
}
}
- private FPerformProjectInfo handleProjectData(ProjectList project) {
+ private FPerformProjectInfo handleProjectData(ProjectList project, String token) {
// 查询演出的详情
- ProjectInfoResp projectInfoFromHttp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getProjectInfoFromHttp(project.getProjectId()), "fetch-project-info");
+ ProjectInfoResp projectInfoFromHttp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getProjectInfoFromHttp(project.getProjectId(), token), "fetch-project-info");
if (Objects.isNull(projectInfoFromHttp)) {
return null;
}
// 查询演出信息
- Perform performsByProjectIdFromHttp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getPerformsByProjectIdFromHttp(project.getProjectId()), "fetch-perform-by-project-id");
+ Perform performsByProjectIdFromHttp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getPerformsByProjectIdFromHttp(project.getProjectId(), token), "fetch-perform-by-project-id");
if (Objects.isNull(performsByProjectIdFromHttp)) {
return null;
}
@@ -235,100 +238,17 @@ public class PullDataFromFWDJob {
}
projectInfo.setSeatPlans(seats);
+ stopThread();
return projectInfo;
}
-
- public void pullPerformDataJob() {
- int pageNum = 0;
- while (true) {
- pageNum++;
- BaseRequest baseRequest = new BaseRequest();
- baseRequest.setCurrent(pageNum);
- baseRequest.setPageSize(50);
- // 查询所有的演出
- ProjectsResp projectsResp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getShowProjectsFromHttp(baseRequest), "fetch-projects");
- if (Objects.isNull(projectsResp)) {
- break;
- }
- List projectLists = projectsResp.getList();
- if (CollectionUtils.isEmpty(projectLists)) {
- break;
- }
- for (ProjectList projectList : projectLists) {
- // 查询演出的详情
- ProjectInfoResp projectInfoFromHttp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getProjectInfoFromHttp(projectList.getProjectId()), "fetch-project-info");
- if (Objects.isNull(projectInfoFromHttp)) {
- continue;
- }
- // 查询演出信息
- Perform performsByProjectIdFromHttp = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getPerformsByProjectIdFromHttp(projectList.getProjectId()), "fetch-perform-by-project-id");
- if (Objects.isNull(performsByProjectIdFromHttp)) {
- continue;
- }
-
- // 查询数据库
- FPerformProjectInfo projectInfo = performProjectInfoMapper.getProjectByProjectId(performsByProjectIdFromHttp.getProjectId());
- if (Objects.isNull(projectInfo)) {
- // 不存在则新增
- saveProjectInfo(projectList, projectInfoFromHttp);
- } else {
- // 存在则更新
- buildUpdateProjectInfo(projectList, projectInfo, projectInfoFromHttp);
- performProjectInfoMapper.update(projectInfo);
- }
-
- // 查询演出信息
- List performInfos = performsByProjectIdFromHttp.getPerformInfos();
- if (CollectionUtils.isEmpty(performInfos)) {
- continue;
- }
- // 查询演出座位档次信息
- List insertList = Lists.newCopyOnWriteArrayList();
- List updateList = Lists.newCopyOnWriteArrayList();
- for (PerformInfo performInfo : performInfos) {
- List performs = performInfo.getPerformInfo();
- if (CollectionUtils.isEmpty(performs)) {
- continue;
- }
- for (PerformDetail perform : performs) {
- if (CollectionUtils.isEmpty(perform.getSeatPlans())) {
- continue;
- }
- List seatPlanIds = perform.getSeatPlans().stream().map(SeatPlan::getSeatPlanId).collect(Collectors.toList());
- List seatPlanStatusList = httpRequestHelper.fetchWithRetry(() -> performServiceHttp.getSeatPlanStatusFromHttp(seatPlanIds), "fetch-seat-plan-status");
- if (CollectionUtils.isEmpty(seatPlanStatusList)) {
- continue;
- }
- Map map = seatPlanStatusList.stream().collect(Collectors.toMap(SeatPlanStatus::getSeatPlanId, Function.identity(), (a, b) -> a));
- Map existSeatMap = performSeatInfoMapper.getPerformSeatInfoBySeatIds(seatPlanIds)
- .stream()
- .collect(Collectors.toMap(FPerformSeatInfo::getSeatPlanId, Function.identity(), (a, b) -> a));
- for (SeatPlan seatPlan : perform.getSeatPlans()) {
- if (map.containsKey(seatPlan.getSeatPlanId())) {
- SeatPlanStatus value = map.get(seatPlan.getSeatPlanId());
- if (existSeatMap.containsKey(seatPlan.getSeatPlanId())) {
- // 更新
- FPerformSeatInfo performSeatInfo = existSeatMap.get(seatPlan.getSeatPlanId());
- performSeatInfo.setSoldStock(value.getSoldOutFlag() ? 1 : 0);
- updateList.add(performSeatInfo);
- } else {
- // 新增
- saveSeatInfo(projectList.getProjectId(), seatPlan.getSeatPlanId(), value, seatPlan, insertList);
- }
- }
- }
- }
- }
- if (!CollectionUtils.isEmpty(insertList)) {
- performSeatInfoMapper.batchSave(insertList);
- }
- if (!CollectionUtils.isEmpty(updateList)) {
- for (FPerformSeatInfo seatInfo : updateList) {
- performSeatInfoMapper.update(seatInfo);
- }
- }
- }
+ private static void stopThread() {
+ try {
+ String random = RandomCodeUtils.getNumberRandomCode(1);
+ log.info("线程暂停:{}s", random);
+ Thread.sleep(Long.parseLong(random) * 1000);
+ } catch (InterruptedException e) {
+ log.error("线程暂停1s失败");
}
}
diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java
index b955e5f..7d4c351 100644
--- a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java
+++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java
@@ -1,5 +1,6 @@
package com.xiang.xservice.application.script.fwd.server;
+import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper;
import com.xiang.xservice.basic.common.resp.Result;
import com.xiang.xservice.basic.utils.DateUtils;
import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig;
@@ -27,13 +28,15 @@ public class FwdDataController {
private final IPerformService performService;
private final IPerformServiceHttp performServiceHttp;
+ private final FwdUserConfigMapper userConfigMapper;
@PostMapping("/refreshData")
public Result refreshData() {
+ String token = userConfigMapper.getAvailableUser().get(0).getToken();
List availablePerforms = performService.getAvailablePerform();
for (FPerformConfig availablePerform : availablePerforms) {
- ProjectInfoResp info = performServiceHttp.getProjectInfoFromHttp(availablePerform.getProjectId());
- Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(availablePerform.getProjectId());
+ ProjectInfoResp info = performServiceHttp.getProjectInfoFromHttp(availablePerform.getProjectId(), token);
+ Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(availablePerform.getProjectId(), token);
FPerformProjectInfo performByProjectId = performService.getPerformByProjectId(availablePerform.getProjectId());
performByProjectId.setStatus(info.getStatus());
performByProjectId.setPreSaleTime(DateUtils.getDateTimeFromStr(info.getPreSaleTime()));
@@ -53,7 +56,7 @@ public class FwdDataController {
continue;
}
List seatIds = seatPlans.stream().map(SeatPlan::getSeatPlanId).collect(Collectors.toList());
- List seatPlanStatusFromHttp = performServiceHttp.getSeatPlanStatusFromHttp(seatIds);
+ List seatPlanStatusFromHttp = performServiceHttp.getSeatPlanStatusFromHttp(seatIds, token);
if (CollectionUtils.isEmpty(seatPlanStatusFromHttp)) {
continue;
}
diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java
index a1acd25..658fdce 100644
--- a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java
+++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java
@@ -1,5 +1,6 @@
package com.xiang.xservice.application.script.fwd.server;
+import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper;
import com.xiang.xservice.basic.common.req.BaseRequest;
import com.xiang.xservice.basic.common.resp.Result;
import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform;
@@ -28,6 +29,7 @@ public class FwdOuterController {
private final IPerformServiceHttp performServiceHttp;
private final IPerformService performService;
+ private final FwdUserConfigMapper fwdUserConfigMapper;
private static final List FREQUENT_IDS = List.of(50438548L, 35320661L, 50436621L, 50442739L);
@@ -39,13 +41,15 @@ public class FwdOuterController {
@GetMapping("/getProjectInfo/{id}")
public Result getProjectInfo(@PathVariable("id") Long id) {
- Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(id);
+ String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken();
+ Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(id, token);
return Result.success("查询成功!", performsByProjectIdFromHttp);
}
@GetMapping("/getPerformsByProjectIdFromHttp/{id}")
public Result getPerformsByProjectIdFromHttp(@PathVariable("id") Long id) {
- Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(id);
+ String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken();
+ Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(id, token);
return Result.success("查询成功!", performsByProjectIdFromHttp);
}
@@ -59,7 +63,8 @@ public class FwdOuterController {
@GetMapping("/getSeatPlanStatus")
public Result getSeatPlanStatu (@RequestParam List ids) {
- List seatPlanStatusFromHttp = performServiceHttp.getSeatPlanStatusFromHttp(ids);
+ String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken();
+ List seatPlanStatusFromHttp = performServiceHttp.getSeatPlanStatusFromHttp(ids, token);
return Result.success("查询成功!", seatPlanStatusFromHttp);
}
diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java
index 881b78a..a5e96a4 100644
--- a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java
+++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/IPerformServiceHttp.java
@@ -24,7 +24,7 @@ public interface IPerformServiceHttp {
* @param projectId projectId
* @return ProjectInfoResp
*/
- ProjectInfoResp getProjectInfoFromHttp(Long projectId);
+ ProjectInfoResp getProjectInfoFromHttp(Long projectId, String token);
/**
* http请求创建演出订单
@@ -38,14 +38,14 @@ public interface IPerformServiceHttp {
* @param projectId
* @return
*/
- Perform getPerformsByProjectIdFromHttp(Long projectId);
+ Perform getPerformsByProjectIdFromHttp(Long projectId, String token);
/**
* http请求获取座位状态信息
* @param seatPlanIds
* @return
*/
- List getSeatPlanStatusFromHttp(List seatPlanIds);
+ List getSeatPlanStatusFromHttp(List seatPlanIds, String token);
/**
* http请求查询观影人信息
diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java
index 305a463..c5106c2 100644
--- a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java
+++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceHttpServiceImpl.java
@@ -66,11 +66,11 @@ public class PerformServiceHttpServiceImpl implements IPerformServiceHttp {
}
@Override
- public ProjectInfoResp getProjectInfoFromHttp(Long projectId) {
+ public ProjectInfoResp getProjectInfoFromHttp(Long projectId, String token) {
Map params = Maps.newHashMap();
params.put("project_id", String.valueOf(projectId));
params.put("v", String.valueOf(Instant.now().getEpochSecond()));
- String respStr = HttpUtils.doGet(UrlConstants.PROJECTS_INFO_URL, buildFWDHeaders(UrlConstants.token), params);
+ String respStr = HttpUtils.doGet(UrlConstants.PROJECTS_INFO_URL, buildFWDHeaders(token), params);
if (StringUtils.isBlank(respStr)) {
return null;
}
@@ -104,19 +104,23 @@ public class PerformServiceHttpServiceImpl implements IPerformServiceHttp {
return projectOrderCreateResp;
}
if (Objects.nonNull(code) && Objects.equals(code, CodeConstants.LIMIT)) {
- Integer waitTime = new Random().nextInt(10);
- log.info("触发FWD限流机制,等待:{}秒后重新发送。", waitTime);
+ Integer waitTime = new Random().nextInt(5);
+ try {
+ log.info("触发FWD限流机制,等待:{}秒后重新发送。", waitTime);
+ Thread.sleep((long) waitTime * 1000);
+ } catch (InterruptedException e) {
+ log.error("线程暂停失败!");
+ }
return null;
}
return null;
}
-
@Override
- public Perform getPerformsByProjectIdFromHttp(Long projectId) {
+ public Perform getPerformsByProjectIdFromHttp(Long projectId, String token) {
Map params = Maps.newHashMap();
params.put("project_id", String.valueOf(projectId));
params.put("v", String.valueOf(Instant.now().getEpochSecond()));
- String respStr = HttpUtils.doGet(UrlConstants.PERFORMS_URL, buildFWDHeaders(UrlConstants.token), params);
+ String respStr = HttpUtils.doGet(UrlConstants.PERFORMS_URL, buildFWDHeaders(token), params);
if (StringUtils.isBlank(respStr)) {
return null;
}
@@ -134,7 +138,7 @@ public class PerformServiceHttpServiceImpl implements IPerformServiceHttp {
}
@Override
- public List getSeatPlanStatusFromHttp(List seatPlanIds) {
+ public List getSeatPlanStatusFromHttp(List seatPlanIds, String token) {
StringBuilder seatIds = new StringBuilder();
for (Long seatPlanId : seatPlanIds) {
seatIds.append(seatPlanId).append(",");
@@ -142,7 +146,7 @@ public class PerformServiceHttpServiceImpl implements IPerformServiceHttp {
Map params = Maps.newHashMap();
params.put("seatPlanIds", seatIds.substring(0, seatIds.length() - 2));
params.put("type", "3");
- String respStr = HttpUtils.doGet(UrlConstants.PROJECT_SEAT_STATUS_URL, buildFWDHeaders(UrlConstants.token), params);
+ String respStr = HttpUtils.doGet(UrlConstants.PROJECT_SEAT_STATUS_URL, buildFWDHeaders(token), params);
if (StringUtils.isBlank(respStr)) {
return Lists.newArrayList();
}
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 6591d81..f1ee85c 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
@@ -122,7 +122,7 @@ public class PerformServiceImpl implements IPerformService {
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分钟内完成付款!";
+ String msg = "【芬玩岛】下单成功✅✅✅,演出名称:" + performByProjectId.getProjectName() + ",请在5分钟内完成付款!";
dingTalkService.sendScriptMsg(msg);
return Boolean.TRUE;
}