浏览代码

Bug修复

tangxiangan 4 月之前
父节点
当前提交
4a905e3a51

+ 2 - 1
pdf-office-pdf-website/src/main/java/cn/kdan/cloud/pdf/office/website/service/impl/LotteryServiceImpl.java

@@ -145,7 +145,7 @@ public class LotteryServiceImpl implements LotteryService {
         Calendar calendar = Calendar.getInstance();
         calendar.set(2024, Calendar.DECEMBER, 31, 23, 59, 59); // 设置为2024年12月31日23:59:59
         calendar.set(Calendar.MILLISECOND, 0);
-
+        calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
         prizeVO.setEndDate(calendar.getTime());
         //1是黑五2是老带新
         prizeVO.setActivityType("1");
@@ -164,6 +164,7 @@ public class LotteryServiceImpl implements LotteryService {
         prizeVO.setCode(getFilmageCode(userApi.getById(userId).getResult().getEmail()));
         prizeVO.setStartDate(new Date());
         Calendar calendar = Calendar.getInstance();
+        calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
         calendar.set(2024, Calendar.DECEMBER, 31, 23, 59, 59); // 设置为2024年12月31日23:59:59
         calendar.set(Calendar.MILLISECOND, 0);
 

+ 3 - 2
pdf-office-sso/src/main/java/cn/kdan/cloud/pdf/office/sso/service/impl/AuthServiceImpl.java

@@ -555,8 +555,9 @@ public class AuthServiceImpl implements AuthService {
         prizeVO.setCode(getUpperCaseSubstringFromUUID(8));
         prizeVO.setStartDate(new Date());
         Calendar calendar = Calendar.getInstance();
-        calendar.set(2024, Calendar.DECEMBER, 31, 24, 0, 0); // 设置为2024年12月31日24:00
-        calendar.set(Calendar.MILLISECOND, 0); // 清除毫秒部分
+        calendar.set(2024, Calendar.DECEMBER, 31, 23, 59, 59); // 设置为2024年12月31日23:59:59
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
 
         prizeVO.setEndDate(calendar.getTime());
         //1是黑五2是老带新