|
|
@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.time.ZoneId;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -60,7 +61,7 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
|
|
|
@Autowired
|
|
|
private ILiveCompletionPointsRecordService completionPointsRecordService;
|
|
|
|
|
|
-
|
|
|
+ private static final ZoneId ZONE_ID = ZoneId.of("GMT+8");
|
|
|
@Override
|
|
|
public R liveList(PageRequest pageRequest) {
|
|
|
int start = (pageRequest.getCurrentPage() - 1) * pageRequest.getPageSize();
|
|
|
@@ -226,8 +227,10 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
|
|
|
} else {
|
|
|
liveVo.setTodayRewardReceived(false);
|
|
|
}
|
|
|
-
|
|
|
- return R.ok().put("data", liveVo);
|
|
|
+ return R.ok().put("serviceTime", System.currentTimeMillis())
|
|
|
+ .put("serviceStartTime", liveVo.getStartTime() == null ? null : liveVo.getStartTime().atZone(ZONE_ID).toInstant().toEpochMilli())
|
|
|
+ .put("serviceEndTime", liveVo.getFinishTime() == null ? null : liveVo.getFinishTime().atZone(ZONE_ID).toInstant().toEpochMilli())
|
|
|
+ .put("data", liveVo);
|
|
|
}
|
|
|
|
|
|
/**
|