Ver código fonte

修改订阅结束时间查询为utf+0时区

wangpenghui 1 ano atrás
pai
commit
62bae41161

+ 1 - 1
pdf-office-common/src/main/java/cn/kdan/cloud/pdf/office/common/utils/MyDateUtils.java

@@ -19,7 +19,7 @@ import java.util.Date;
  */
 public class MyDateUtils {
 
-    private final static ZoneId zoneId = ZoneId.systemDefault();
+    private final static ZoneId zoneId = ZoneId.of("UTC+0");
 
     private MyDateUtils() {
     }

+ 2 - 1
pdf-office-sso/src/main/java/cn/kdan/cloud/pdf/office/sso/controller/UserController.java

@@ -4,6 +4,7 @@ import cn.kdan.cloud.pdf.office.api.account.feign.UserApi;
 
 import cn.kdan.cloud.pdf.office.api.payment.feign.SubscriptionApi;
 import cn.kdan.cloud.pdf.office.common.enums.account.PayTypeEnum;
+import cn.kdan.cloud.pdf.office.common.utils.MyDateUtils;
 import cn.kdan.cloud.pdf.office.common.vo.UserInfoVO;
 import cn.kdan.cloud.pdf.office.api.product.feign.ProductApi;
 import cn.kdan.cloud.pdf.office.api.product.vo.ProductVO;
@@ -64,7 +65,7 @@ public class UserController {
                     //自动续订,显示续订日期
                     if(!ObjectUtils.isEmpty(item.getEndDate())&&PayTypeEnum.AUTO.value().equals(item.getPayType())){
                         LocalDateTime payTime = subscriptionApi.getNextPayTime(item.getUserId(),item.getProductId()).getResult();
-                        Date date = Date.from(payTime.atZone(ZoneId.systemDefault()).toInstant());
+                        Date date = MyDateUtils.localDateTimeToDate(payTime);
                         item.setEndDate(date);
                     }
                     // 没有购买显示当前时间