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 2db950f..69fef68 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 @@ -20,6 +20,7 @@ import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.dom4j.Document; @@ -323,12 +324,8 @@ public class PayController extends BaseController if (null == startDate) { startDate = new Date(); } - Date endDate = appUser.getEndTime(); - if (null == endDate) { - endDate = startDate; - } - endDate = appOrder.getLevel() == 1 ? DateUtils.dateAddTime(endDate,3,7) - : (appOrder.getLevel() == 2 ? DateUtils.dateAddTime(endDate,4,31) : DateUtils.dateAddTime(endDate,5,365)); + Date endDate = appOrder.getLevel() == 1 ? DateUtils.dateAddTime(startDate,3,7) + : (appOrder.getLevel() == 2 ? DateUtils.dateAddTime(startDate,4,31) : DateUtils.dateAddTime(startDate,5,365)); userEntity.setOrderStartTime(startDate); userEntity.setOrderEndTime(endDate); appUserMapper.updateAppUser(userEntity);