From 42c6037de8253d1ea8fc7c2c7383485d66668bca Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Fri, 26 Apr 2024 19:22:16 +0800 Subject: [PATCH] ~ --- .../ruoyi/common/core/utils/DateUtils.java | 27 +++++++++++++++++++ .../ruoyi/app/controller/PayController.java | 9 ++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index 2cb8926..d955b70 100644 --- a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -180,4 +180,31 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } + + /** + * 给datetime时间类型减去指定时间 type=1 增加分钟 type = 2 增加小时 type= 3增加天 type= 4 增加月 type=5增加年 + * @return + */ + public static Date dateSubtractTime(Date stateTime,int type, int num) { + LocalDateTime localDate = ZonedDateTime.ofInstant(stateTime.toInstant(), ZoneId.systemDefault()).toLocalDateTime(); + switch (type) { + case 1: + localDate = localDate.minusMinutes(num); + break; + case 2: + localDate = localDate.minusHours(num); + break; + case 3: + localDate = localDate.minusDays(num); + break; + case 4: + localDate = localDate.minusMonths(num); + break; + case 5: + localDate = localDate.minusYears(num); + break; + } + ZonedDateTime zdt = localDate.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java index 4a62b92..e4148fd 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java @@ -8,6 +8,7 @@ import com.ruoyi.app.mapper.AppOrderPayMapper; import com.ruoyi.app.mapper.AppUserMapper; import com.ruoyi.app.service.IAppDynamicCommentService; import com.ruoyi.app.service.IPayService; +import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -183,9 +184,11 @@ public class PayController extends BaseController if (null == endDate) { endDate = startDate; } - - - + endDate = appOrder.getLevel() == 1 ? DateUtils.dateSubtractTime(endDate,3,7) + : (appOrder.getLevel() == 2 ? DateUtils.dateSubtractTime(endDate,4,31) : DateUtils.dateSubtractTime(endDate,5,365)); + userEntity.setOrderStartTime(startDate); + userEntity.setOrderEndTime(endDate); + appUserMapper.updateAppUser(userEntity); out.println("success"); } catch (Exception e) { log.info("异常订单:" + wexinResult.toString());