From 21efcf3ea6f3f43fdefbc5a99f3028dc28678c7c Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 14 Apr 2025 14:14:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/common/enums/CreditsEventsEnum.java    | 8 ++++++++
 .../com/ai/da/controller/ConvenientInquiryController.java | 7 +++++++
 .../java/com/ai/da/service/ConvenientInquiryService.java  | 2 ++
 .../ai/da/service/impl/ConvenientInquiryServiceImpl.java  | 4 ++++
 4 files changed, 21 insertions(+)

diff --git a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java
index 2711d04b..5dc8ff30 100644
--- a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java
+++ b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java
@@ -3,6 +3,9 @@ package com.ai.da.common.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.List;
+
 @AllArgsConstructor
 @Getter
 public enum CreditsEventsEnum {
@@ -45,4 +48,9 @@ public enum CreditsEventsEnum {
      * 对应事件需要消耗or获得的积分
      */
     private String value;
+
+    public static List<String> generateFunctionNames() {
+        return Arrays.asList(SLOGAN.name, LOGO.name, PATTERN.name, MOOD_BOARD.name, SKETCH_BOARD.name,
+                TO_PRODUCT_IMAGE.name, RELIGHT.name, IMAGE_TO_SKETCH.name, POSE_TRANSFORMATION.name);
+    }
 }
diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
index 9925474f..9acaa9a4 100644
--- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
+++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
@@ -199,4 +199,11 @@ public class ConvenientInquiryController {
     public Response<PageBaseResponse<AccountCreditsUsageDTO>> getGenerateFrequency(@Valid @RequestBody AccountCreditsUsageQueryDTO queryDTO){
        return Response.success(convenientInquiryService.getGenerateFrequency(queryDTO));
     }
+
+    @ApiOperation("获取所有生成功能的名字")
+    @GetMapping("/getAllGenerateFuncName")
+    public Response<List<String>> getAllGenerateFuncName(){
+        return Response.success(convenientInquiryService.getAllGenerateFuncName());
+    }
+
 }
diff --git a/src/main/java/com/ai/da/service/ConvenientInquiryService.java b/src/main/java/com/ai/da/service/ConvenientInquiryService.java
index 8cd4eb6b..64bf0e85 100644
--- a/src/main/java/com/ai/da/service/ConvenientInquiryService.java
+++ b/src/main/java/com/ai/da/service/ConvenientInquiryService.java
@@ -56,4 +56,6 @@ public interface ConvenientInquiryService extends IService<Questionnaire> {
     String exportTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response);
 
     PageBaseResponse<AccountCreditsUsageDTO> getGenerateFrequency(AccountCreditsUsageQueryDTO queryDTO);
+
+    List<String> getAllGenerateFuncName();
 }
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 00192bc7..747e5b62 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -905,4 +905,8 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
         }
     }
 
+    public List<String> getAllGenerateFuncName(){
+        return CreditsEventsEnum.generateFunctionNames();
+    }
+
 }

From 77a06e0eddb24316a167e1951fa669b1520743d4 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 14 Apr 2025 14:58:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bugfix:account=20mapper=20count=20=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/primary/AccountMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/primary/AccountMapper.xml b/src/main/resources/mapper/primary/AccountMapper.xml
index c41ba29d..c21f0c6b 100644
--- a/src/main/resources/mapper/primary/AccountMapper.xml
+++ b/src/main/resources/mapper/primary/AccountMapper.xml
@@ -99,7 +99,7 @@
 
     <!-- 查询总记录数 (优化版) -->
     <select id="countCreditUsage" resultType="int">
-        SELECT COUNT(1)
+        SELECT COUNT(DISTINCT a.id)
         FROM t_account a
         <if test="changeEvent != null or startTime != null or endTime != null">
             LEFT JOIN t_credits_detail cd ON a.id = cd.account_id

From d6c869727abda236215f4ffc10e08bf018e385e5 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 14 Apr 2025 15:18:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=94=E8=A6=81=E6=B1=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/controller/ElementController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/ElementController.java b/src/main/java/com/ai/da/controller/ElementController.java
index ee0b65f6..96010a03 100644
--- a/src/main/java/com/ai/da/controller/ElementController.java
+++ b/src/main/java/com/ai/da/controller/ElementController.java
@@ -112,12 +112,12 @@ public class ElementController {
     @ApiOperation(value = "图片分割")
     @PostMapping("/imageSegmentation")
     public Response<List<CollectionElementVO>> selectedImageSeg(
-            @RequestPart(value = "files", required = false) MultipartFile[] files,
+            @RequestPart(value = "file", required = false) MultipartFile[] file,
             @RequestParam(value = "type", required = false) @Pattern(regexp = "sketch|product", message = "类型必须是sketch或product") String type,
             @RequestParam(value = "id", required = false) Long id) {
         // 过滤空文件
-        List<MultipartFile> nonEmptyFiles = Arrays.stream(files)
-                .filter(file -> !file.isEmpty())
+        List<MultipartFile> nonEmptyFiles = Arrays.stream(file)
+                .filter(item -> !item.isEmpty())
                 .collect(Collectors.toList());
         // 参数校验
         if ((nonEmptyFiles.isEmpty()) && id == null) {