diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java index e32b013..e2c6001 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CShopUserServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSON; import cn.hutool.json.JSONUtil; @@ -205,6 +206,14 @@ public class CShopUserServiceImpl implements ShopUserService { } } + public static void main(String[] args) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(Calendar.DAY_OF_YEAR, 50); + Date endTime = calendar.getTime(); + System.out.println(DateUtil.formatDate(endTime)); + } + @Override public ShopUser updateShopUserRemoveVipTime(Long userId, String type) { //* 移除会员时间 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/util/AppleyPay.java b/ruoyi-system/src/main/java/com/ruoyi/system/util/AppleyPay.java index 7b8d73c..9889343 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/util/AppleyPay.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/util/AppleyPay.java @@ -208,7 +208,7 @@ public class AppleyPay { if (selectOrderInfo != null) { log.warn("交易ID {} 已存在,可能重复处理。用户ID: {}", transactionId, userId); // 交易信息已存在 - return null; + return shopUserService.selectUserById(userId); } if (StringUtils.isEmpty(transactionId)) {