aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.0' into dev/dev

Browse Source
This commit is contained in:
xupei
2024-12-10 10:04:27 +08:00
parent 9e28d579d1 3c0fa205d1
commit e9e8e87719
6 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/common/config/MyTaskScheduler.java
View File

@@ -51,7 +51,7 @@ public class MyTaskScheduler {
// 定时任务，每十五天执行一次
// @Scheduled(cron = "0 0 0 ? * MON")
// @Scheduled(cron = "0 0 0 */15 * ?")
@Scheduled(cron = "0 0 0 */15 * ?")
public void checkExpiry() {
// 检测正式用户是否快要过期
QueryWrapper<Account> qw = new QueryWrapper<>();
@@ -85,7 +85,7 @@ public class MyTaskScheduler {
}
}
}
// @Scheduled(cron = "0 0 9 * * ?")
@Scheduled(cron = "0 0 9 * * ?")
public void sendTrialOrderExcelToManagements() {
// 获取前一天日期
LocalDate yesterday = LocalDate.now().minusDays(1);

8
src/main/java/com/ai/da/common/task/AccountTask.java
View File

@@ -26,14 +26,14 @@ public class AccountTask {
accountService.refreshCreditsWeekly();
}
// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
@Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
public void getPaidUser() {
// 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单
accountService.extendValidityForCC();
}
// 每天凌晨0点执行一次
// @Scheduled(cron = "0 0 0 * * ?")
@Scheduled(cron = "0 0 0 * * ?")
public void cancelActivityBenefits() {
// 1、查询当前所有参与了活动且过期的用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -46,7 +46,7 @@ public class AccountTask {
}
// 每天检测正式用户到期情况，每天凌晨0点执行
// @Scheduled(cron = "0 0 0 * * ?")
@Scheduled(cron = "0 0 0 * * ?")
public void paidUserToVisitor() {
// 1、查询当前已过期正式用户或试用用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -63,7 +63,7 @@ public class AccountTask {
/**
* 将Code-Create上注册的用户添加为AiDA的游客
*/
// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
@Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
public void registerUserToVisitor() {
accountService.registerUserToVisitor();
}

2
src/main/java/com/ai/da/common/task/PaypalTask.java
View File

@@ -23,7 +23,7 @@ public class PaypalTask {
@Resource
private PayPalCheckoutService payPalCheckoutService;
// @Scheduled(cron = "0/30 * * * * ?")
@Scheduled(cron = "0/30 * * * * ?")
public void orderConfirm() throws SerializeException {
// log.info("PayPal orderConfirm 被执行......");

2
src/main/java/com/ai/da/common/task/StripeTask.java
View File

@@ -22,7 +22,7 @@ public class StripeTask {
@Resource
private StripeService stripeService;
// @Scheduled(cron = "0/30 * * * * ?")
@Scheduled(cron = "0/30 * * * * ?")
public void orderConfirm() throws SerializeException {
// 查看超过30分钟以上仍未支付的订单 置为超时订单

23
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -545,7 +545,12 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
// .like(TrialOrder::getUserName, accountTrialDTO.getUserName()));
List<TrialOrder> trialOrders = trialOrderMapper.selectList(trialOrderQueryWrapper);
if (CollectionUtil.isNotEmpty(trialOrders)) {
throw new BusinessException("You have submitted a trial application, please wait for approval.");
TrialOrder trialOrder = trialOrders.get(0);
if (trialOrder.getStatus() == 1) {
throw new BusinessException("You have submitted a trial application, please wait for approval.");
}else {
throw new BusinessException("You have already been approved for a trial, please do not apply for the trial again");
}
}
// 先检测用户名和邮箱
QueryWrapper<Account> qw = new QueryWrapper<>();
@@ -1456,19 +1461,23 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
queryWrapper.in("user_email", allEmail).select("user_email");
// 重复的邮箱
List<String> collect = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList());
if (!collect.isEmpty()){
List<String> duplicateEmails = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList());
if (!duplicateEmails.isEmpty()){
// 移除Code-Create新增用户中在AiDA已有账号的邮箱，allEmail中剩余邮箱均为新用户邮箱
allEmail.removeAll(collect);
allEmail.removeIf(item -> duplicateEmails.stream()
.anyMatch(removeItem -> removeItem.equalsIgnoreCase(item)));
if (!allEmail.isEmpty()){
for (Map<String,String> userInfo : newUsersInfo){
Iterator<Map<String, String>> iterator = newUsersInfo.iterator();
while (iterator.hasNext()) {
Map<String, String> userInfo = iterator.next();
String email = userInfo.get("email");
if (!allEmail.contains(email)) {
newUsersInfo.remove(userInfo); // 移除不在 allEmail 中的用户
iterator.remove(); // 使用迭代器安全地移除元素
}
}
}else {
newUsersInfo.clear();
}
}
// 将新增用户添加到AiDA，身份为游客
if (!newUsersInfo.isEmpty()){