|
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
|
+import java.time.ZoneId;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
import java.time.temporal.ChronoUnit;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -120,7 +121,7 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ private static final ZoneId ZONE_ID = ZoneId.of("GMT+8");
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public R liveDetail(Long id, Long userId) {
|
|
public R liveDetail(Long id, Long userId) {
|
|
@@ -180,7 +181,10 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
|
|
|
liveVo.setTodayRewardReceived(false);
|
|
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);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|