diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index f9c12752..30295880 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -476,7 +476,14 @@ public class AccountServiceImpl extends ServiceImpl impl .eq(Account::getUserName, accountTrialDTO.getUserName()); List accountList = accountMapper.selectList(qw); if (CollectionUtil.isNotEmpty(accountList)) { - throw new BusinessException("The username or email has already been registered", ResultEnum.PROMPT.getCode()); + if (accountList.get(0).getIsTrial() == 1) { + throw new BusinessException("The username or email has already been registered", ResultEnum.PROMPT.getCode()); + } +// else { +// Account account = accountList.get(0); +// account.setIsTrial(1); +// accountMapper.updateById(account); +// } } // 接收到数据后要形成一条使用订单信息 TrialOrder trialOrder = CopyUtil.copyObject(accountTrialDTO, TrialOrder.class); @@ -491,16 +498,25 @@ public class AccountServiceImpl extends ServiceImpl impl trialOrder.setUpdateTime(LocalDateTime.now()); trialOrderMapper.updateById(trialOrder); Account account = new Account(); - account.setUserName(trialOrder.getUserName()); - account.setUserPassword("Third-000000"); - account.setUserEmail(trialOrder.getEmail()); - account.setLanguage(Language.ENGLISH.name()); - account.setValidStartTime(System.currentTimeMillis()); - account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); - account.setCreateDate(new Date()); - account.setIsTrial(1); - account.setIsBeginner(1); - accountMapper.insert(account); + if (CollectionUtil.isNotEmpty(accountList)) { + account = CopyUtil.copyObject(accountList.get(0), Account.class); + account.setIsTrial(1); + account.setIsBeginner(1); + account.setValidStartTime(System.currentTimeMillis()); + account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); + accountMapper.updateById(account); + }else { + account.setUserName(trialOrder.getUserName()); + account.setUserPassword("Third-000000"); + account.setUserEmail(trialOrder.getEmail()); + account.setLanguage(Language.ENGLISH.name()); + account.setValidStartTime(System.currentTimeMillis()); + account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); + account.setCreateDate(new Date()); + account.setIsTrial(1); + account.setIsBeginner(1); + accountMapper.insert(account); + } // 发送邮件提醒用户试用用户已创建 SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2); SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3); @@ -522,17 +538,33 @@ public class AccountServiceImpl extends ServiceImpl impl trialOrder.setStatus(1); trialOrder.setUpdateTime(LocalDateTime.now()); trialOrderMapper.updateById(trialOrder); + + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(Account::getUserEmail, trialOrder.getEmail()) + .or() + .eq(Account::getUserName, trialOrder.getUserName()); + List accountList = accountMapper.selectList(qw); + Account account = new Account(); - account.setUserName(trialOrder.getUserName()); - account.setUserPassword("Third-000000"); - account.setUserEmail(trialOrder.getEmail()); - account.setLanguage(Language.ENGLISH.name()); - account.setValidStartTime(System.currentTimeMillis()); - account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); - account.setCreateDate(new Date()); - account.setIsTrial(1); - account.setIsBeginner(1); - accountMapper.insert(account); + if (CollectionUtil.isNotEmpty(accountList)) { + account = CopyUtil.copyObject(accountList.get(0), Account.class); + account.setIsTrial(1); + account.setIsBeginner(1); + account.setValidStartTime(System.currentTimeMillis()); + account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); + accountMapper.updateById(account); + }else { + account.setUserName(trialOrder.getUserName()); + account.setUserPassword("Third-000000"); + account.setUserEmail(trialOrder.getEmail()); + account.setLanguage(Language.ENGLISH.name()); + account.setValidStartTime(System.currentTimeMillis()); + account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); + account.setCreateDate(new Date()); + account.setIsTrial(1); + account.setIsBeginner(1); + accountMapper.insert(account); + } // 发送邮件提醒用户试用用户已创建 SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2); SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3); diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index a9510207..59ce6439 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -36,8 +36,8 @@ file.linux.path=/workspace/home/aida/file/ #linux服务器域名(预览和下载用) file.linuxDomain=https://www.aida.com.hk/download/ file.windows.path=D:\\upload\\ -spring.servlet.multipart.max-file-size = 5MB -spring.servlet.multipart.max-request-size= 5MB +spring.servlet.multipart.max-file-size = 10MB +spring.servlet.multipart.max-request-size= 10MB #访问python服务的ip(对应环境) #access.python.ip=http://43.198.80.117 access.python.ip=http://18.167.251.121