From 9053bdf10c38d75a6666e165522fc2a837f1c73c Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 7 Feb 2025 12:48:37 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E8=AF=95=E7=94=A8=E6=B3=A8=E5=86=8C;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/mapper/primary/entity/Account.java | 10 ++++++ .../ai/da/model/dto/AccountBindEmailDTO.java | 15 ++++++++ .../com/ai/da/model/dto/EmailSendDTO.java | 2 ++ .../da/service/impl/AccountServiceImpl.java | 34 +++++++++---------- 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Account.java b/src/main/java/com/ai/da/mapper/primary/entity/Account.java index 1dbebd7f..bddb7493 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Account.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Account.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -125,4 +126,13 @@ public class Account implements Serializable { private Integer subAccountNum; private String invitationCode; + +// @ApiModelProperty("title") +// private String title; +// +// @ApiModelProperty("surname") +// private String surname; +// +// @ApiModelProperty("givenName") +// private String givenName; } diff --git a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java index b5559769..e9913269 100644 --- a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java @@ -21,4 +21,19 @@ public class AccountBindEmailDTO { @NotBlank(message = "emailVerifyCode.cannot.be.empty") @ApiModelProperty("邮箱验证码") private String emailVerifyCode; + +// @ApiModelProperty("国家") +// private String country; +// +// @ApiModelProperty("职业") +// private String occupation; +// +// @ApiModelProperty("title") +// private String title; +// +// @ApiModelProperty("surname") +// private String surname; +// +// @ApiModelProperty("givenName") +// private String givenName; } diff --git a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java index 946946bd..6fda68db 100644 --- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java @@ -28,4 +28,6 @@ public class EmailSendDTO { @ApiModelProperty("职业") private String occupation; + + } 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 8245c886..e12ec8a8 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -333,25 +333,16 @@ public class AccountServiceImpl extends ServiceImpl 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 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()));