From 35604e51305eda5f0aa60befe2fb44b041233ba6 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 27 Aug 2025 10:15:59 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E8=B6=85=E7=AE=A1=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/model/dto/AccountAddDTO.java   |  9 ++++++++-
 .../ai/da/service/impl/AccountServiceImpl.java    | 15 ++++++++-------
 .../impl/ConvenientInquiryServiceImpl.java        |  1 +
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ai/da/model/dto/AccountAddDTO.java b/src/main/java/com/ai/da/model/dto/AccountAddDTO.java
index d23208d3..3679395f 100644
--- a/src/main/java/com/ai/da/model/dto/AccountAddDTO.java
+++ b/src/main/java/com/ai/da/model/dto/AccountAddDTO.java
@@ -4,12 +4,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 
 @Data
-@ApiModel("AccountAdd")
+@ApiModel("AccountAddDTO")
+@NoArgsConstructor
 @AllArgsConstructor
 public class AccountAddDTO {
 
@@ -31,14 +33,19 @@ public class AccountAddDTO {
     @ApiModelProperty("End time of account validity ")
     private String validEndTime;
 
+    @ApiModelProperty("是否是试用用户 0 否 | 1 是")
     private Integer isTrial;
 
+    @ApiModelProperty("分配积分")
     private BigDecimal credits;
 
+    @ApiModelProperty("用户角色")
     private Integer systemUser;
 
+    @ApiModelProperty("学校名称 | 企业名称")
     private String organizationName;
 
+    @ApiModelProperty("可分配子账号总数（仅适用于学校或教育管理员）")
     private Integer subAccountNum;
 
     public AccountAddDTO(String userEmail, String userName, String country, String validStartTime, String validEndTime, Integer isTrial, BigDecimal credits, Integer systemUser) {
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 b0100365..6952b7a6 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -1255,15 +1255,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
 
     static {
         HikariConfig config = new HikariConfig();
-//        config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8");
-//        config.setUsername("uafqtz4gsvfrw");
-//        config.setPassword("aida123456.");
+        config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8");
+        config.setUsername("uafqtz4gsvfrw");
+        config.setPassword("aida123456.");
 //        config.setJdbcUrl("jdbc:mysql://18.167.251.121:33008/aida");
 //        config.setUsername("aida_con");
 //        config.setPassword("123456");
-        config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC");
-        config.setUsername("root");
-        config.setPassword("root");
+//        config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC");
+//        config.setUsername("root");
+//        config.setPassword("root");
         config.addDataSourceProperty("cachePrepStmts", "true");
         config.addDataSourceProperty("prepStmtCacheSize", "250");
         config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
@@ -1643,7 +1643,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     private List<Account> getValidAdminAccounts(long currentEpochMilli) {
         QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
-                .select(Account::getId, Account::getOrganizationName, Account::getCreditsUsageLimit)
+                .select(Account::getId, Account::getOrganizationName,
+                        Account::getCreditsUsageLimit, Account::getSubAccountNum)
                 .eq(Account::getSystemUser, 7) // 教育版管理员
                 .gt(Account::getValidEndTime, currentEpochMilli); // 账号有效期内
 
diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
index fc481624..32e01b2c 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -536,6 +536,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
 
         if (Objects.nonNull(accountAddDTO.getCredits())){
             account.setCredits(accountAddDTO.getCredits());
+            account.setCreditsUsageLimit(accountAddDTO.getCredits());
         }
         if (Objects.nonNull(accountAddDTO.getSubAccountNum())){
             account.setSubAccountNum(accountAddDTO.getSubAccountNum());