cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

秒杀倒计时修复

Browse Source
This commit is contained in:
taozi
2022-05-01 18:05:08 +08:00
parent 8d424d5425
commit abee61b45e
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -42,10 +42,13 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.OptionalInt;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
/** /**
* <p> * <p>
@ -144,8 +147,8 @@ public class StoreSeckillController {
seckillTimeDto.setState("即将开始"); seckillTimeDto.setState("即将开始");
seckillTimeDto.setTime(jsonObject.get("time").toString().length() > 1 ? jsonObject.get("time").toString() + ":00" : "0" + jsonObject.get("time").toString() + ":00"); seckillTimeDto.setTime(jsonObject.get("time").toString().length() > 1 ? jsonObject.get("time").toString() + ":00" : "0" + jsonObject.get("time").toString() + ":00");
seckillTimeDto.setStatus(2); seckillTimeDto.setStatus(2);
seckillTimeDto.setStop(OrderUtil.dateToTimestamp(new Date()) + activityEndHour * 3600); seckillTimeDto.setStop(today + time * 3600);
} else if (currentHour >= activityEndHour) { } else {
seckillTimeDto.setState("已结束"); seckillTimeDto.setState("已结束");
seckillTimeDto.setTime(jsonObject.get("time").toString().length() > 1 ? jsonObject.get("time").toString() + ":00" : "0" + jsonObject.get("time").toString() + ":00"); seckillTimeDto.setTime(jsonObject.get("time").toString().length() > 1 ? jsonObject.get("time").toString() + ":00" : "0" + jsonObject.get("time").toString() + ":00");
seckillTimeDto.setStatus(0); seckillTimeDto.setStatus(0);
@ -154,8 +157,14 @@ public class StoreSeckillController {
} }
list.add(seckillTimeDto); list.add(seckillTimeDto);
}); });
seckillConfigVo.setSeckillTimeIndex(seckillTimeIndex.get()); List<SeckillTimeDto> seckillTimeDtoList = list.stream()
seckillConfigVo.setSeckillTime(list); .sorted(Comparator.comparing(SeckillTimeDto::getTime))
.collect(Collectors.toList());
OptionalInt optionalInt = IntStream.range(0, seckillTimeDtoList.size())
.filter(i -> seckillTimeDtoList.get(i).getStatus().equals(1))
.findFirst();
seckillConfigVo.setSeckillTimeIndex(optionalInt.isPresent() ? optionalInt.getAsInt() : 0);
seckillConfigVo.setSeckillTime(seckillTimeDtoList);
return ApiResult.ok(seckillConfigVo); return ApiResult.ok(seckillConfigVo);
} }
} }