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

BUGFIX:试用注册;

Browse Source
This commit is contained in:
shahaibo
2025-02-07 12:48:37 +08:00
parent b14297d1af
commit 9053bdf10c
4 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,25 +333,16 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
result.setToken(createAccountToken(accountOld));
}
return result;
}else {
accountOld.setSystemUser(3);
accountOld.setIsTrial(1);
accountOld.setCredits(BigDecimal.valueOf(100));
accountOld.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
accountOld.setUpdateDate(new Date());
accountMapper.updateById(accountOld);
TrialOrder trialOrder = CopyUtil.copyObject(accountOld, TrialOrder.class);
trialOrder.setEmail(accountOld.getUserEmail());
trialOrder.setCreateTime(LocalDateTime.now());
trialOrder.setStatus(1);
// 获取用户申请试用IP
String ipAddress = RequestInfoUtil.getIpAddress(request);
trialOrder.setIp(ipAddress);
trialOrderMapper.insert(trialOrder);
}
}
Account accountNew = accountMapper.selectById(userHolder.getId());
accountNew.setUserEmail(accountBindEmailDTO.getUserEmail());
// accountNew.setOccupation(accountBindEmailDTO.getOccupation());
// accountNew.setCountry(accountBindEmailDTO.getCountry());
// accountNew.setTitle(accountBindEmailDTO.getTitle());
// accountNew.setSurname(accountBindEmailDTO.getSurname());
// accountNew.setGivenName(accountBindEmailDTO.getGivenName());
accountMapper.updateById(accountNew);
TrialOrder trialOrder = CopyUtil.copyObject(accountNew, TrialOrder.class);
@@ -1304,13 +1295,22 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
if (StringUtils.isBlank(accountDesignWorksRegisterDTO.getLanguage())) {
account.setLanguage(Language.ENGLISH.name());
}
account.setIsTrial(0);
account.setSystemUser(3);
account.setIsTrial(1);
account.setCredits(BigDecimal.valueOf(100));
account.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
account.setIsBeginner(1);
account.setValidStartTime(Instant.now().toEpochMilli());
account.setCreateDate(new Date());
account.setCredits(BigDecimal.valueOf(0));
account.setInvitationCode(accountDesignWorksRegisterDTO.getInvitationCode());
accountMapper.insert(account);
TrialOrder trialOrder = CopyUtil.copyObject(account, TrialOrder.class);
trialOrder.setEmail(account.getUserEmail());
trialOrder.setCreateTime(LocalDateTime.now());
trialOrder.setStatus(1);
trialOrderMapper.insert(trialOrder);
AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class);
response.setEmail(account.getUserEmail());
String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId()));