BUGFIX:试用注册;

This commit is contained in:
shahaibo
2025-02-07 11:58:12 +08:00
parent e02c278e7a
commit e90979bbdc

View File

@@ -317,7 +317,9 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
QueryWrapper<AccountExtend> accountExtendQW = new QueryWrapper<>();
accountExtendQW.lambda().eq(AccountExtend::getAccountId, userHolder.getId());
accountExtendQW.lambda().eq(AccountExtend::getAuthType, "Wechat");
AccountExtend accountExtend = accountExtendMapper.selectOne(accountExtendQW);
List<AccountExtend> accountExtends = accountExtendMapper.selectList(accountExtendQW);
if (CollectionUtil.isNotEmpty(accountExtends)) {
AccountExtend accountExtend = accountExtends.get(0);
accountExtend.setAccountId(accountOld.getId());
accountExtendMapper.updateById(accountExtend);
@@ -331,6 +333,22 @@ 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());