Compare commits
2 Commits
0033f7875a
...
2c54b3ce42
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c54b3ce42 | ||
|
|
2cadd66f45 |
@@ -29,7 +29,7 @@ public class CallBackController {
|
|||||||
@RequestMapping("/ios")
|
@RequestMapping("/ios")
|
||||||
public void iosCallBack(@RequestBody String notificationBody) {
|
public void iosCallBack(@RequestBody String notificationBody) {
|
||||||
//System.out.println(notificationBody);
|
//System.out.println(notificationBody);
|
||||||
//log.info("ios 回调参数:{}", JSONUtil.toJsonStr(notificationBody));
|
log.info("ios 回调参数:{}", JSONUtil.toJsonStr(notificationBody));
|
||||||
try {
|
try {
|
||||||
// 异步处理,避免超时
|
// 异步处理,避免超时
|
||||||
CompletableFuture.runAsync(() -> {
|
CompletableFuture.runAsync(() -> {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.ruoyi.system.service.impl;
|
package com.ruoyi.system.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.util.IdUtil;
|
import cn.hutool.core.util.IdUtil;
|
||||||
import cn.hutool.json.JSON;
|
import cn.hutool.json.JSON;
|
||||||
import cn.hutool.json.JSONUtil;
|
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
|
@Override
|
||||||
public ShopUser updateShopUserRemoveVipTime(Long userId, String type) {
|
public ShopUser updateShopUserRemoveVipTime(Long userId, String type) {
|
||||||
//* 移除会员时间
|
//* 移除会员时间
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ public class AppleyPay {
|
|||||||
if (selectOrderInfo != null) {
|
if (selectOrderInfo != null) {
|
||||||
log.warn("交易ID {} 已存在,可能重复处理。用户ID: {}", transactionId, userId);
|
log.warn("交易ID {} 已存在,可能重复处理。用户ID: {}", transactionId, userId);
|
||||||
// 交易信息已存在
|
// 交易信息已存在
|
||||||
return null;
|
return shopUserService.selectUserById(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.isEmpty(transactionId)) {
|
if (StringUtils.isEmpty(transactionId)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user