From a830a73fd10a21e3793c79a35be4e532de124c6f Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 17:25:16 +0800
Subject: [PATCH] 10.17.1
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index 2aba9e5..5522269 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -103,9 +103,10 @@
// 2.0
ArrayList<Map<String,Object>> objects = new ArrayList<>();
if(null != competition.getStoreId()){
- HashMap<String, Object> map = new HashMap<>();
+
String storeId = competition.getStoreId();
for (String s : storeId.split(",")) {
+ HashMap<String, Object> map = new HashMap<>();
Store store = storeClient.queryStoreById(Integer.valueOf(s));
map.put("name",store.getName());
map.put("address",store.getAddress());
@@ -117,8 +118,9 @@
double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
map.put("distance",wgs84);
}
+ objects.add(map);
}
- objects.add(map);
+
}
competitionInfo.setStoreInfos(objects);
@@ -143,6 +145,9 @@
List<ParticipantVo> participant = new ArrayList<>();
List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", one.getId()));
List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
List<Participant> participants = participantService.listByIds(collect);
SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
for (Participant participant1 : participants) {
--
Gitblit v1.7.1