From 13c23379856b7e32a1ff5989ccd22036b3d070ad Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Sun, 28 Jan 2024 12:18:26 +0800
Subject: [PATCH] init

---
 .../controller/app/SettingAppController.java    | 16 ++++++++++++++++
 .../cai/controller/app/WalletController.java    |  2 +-
 .../cai/dto/commom/setting/CateSelectVo.java    | 17 +++++++++++++++++
 .../impl/AccountChangeLogServiceImpl.java       |  3 +++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/commom/setting/CateSelectVo.java

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
index c26f202e..f2e6a3e4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
@@ -9,7 +9,9 @@ import com.ruoyi.cai.dto.app.vo.AgreementDTO;
 import com.ruoyi.cai.dto.app.vo.GiftVo;
 import com.ruoyi.cai.dto.app.vo.setting.SettingGoodsVo;
 import com.ruoyi.cai.dto.app.vo.setting.WithdrawExchangeVo;
+import com.ruoyi.cai.dto.commom.setting.CateSelectVo;
 import com.ruoyi.cai.enums.SystemConfigEnum;
+import com.ruoyi.cai.enums.account.AccountCateEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.annotation.Log;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -80,6 +83,19 @@ public class SettingAppController {
     }
 
 
+    @GetMapping("/accountDetail/type")
+    @Operation(summary = "账户明细类型")
+    @Log(title = "账户明细类型", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<List<CateSelectVo>> accountDetailType(){
+        List<CateSelectVo> vo = new ArrayList<>();
+        AccountCateEnum[] values = AccountCateEnum.values();
+        vo.add(new CateSelectVo(0,"全部"));
+        for (AccountCateEnum value : values) {
+            vo.add(new CateSelectVo(value.getCode(),value.getText()));
+        }
+        return R.ok(vo);
+    }
+
     @GetMapping("/gift")
     @Operation(summary = "礼物配置")
     @Log(title = "礼物配置", businessType = BusinessType.OTHER, isSaveDb = false)
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
index 8821411b..28553137 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
@@ -55,7 +55,7 @@ public class WalletController {
     @Operation(summary = "账户明细-分页")
     @Log(title = "账户明细", businessType = BusinessType.OTHER, isSaveDb = false)
     public R<List<AccountDetailsAppVo>> accountDetail(PageQuery query,
-                                              @Parameter(description = "类型 0-普通会员 1-超级会员") Integer cateId){
+                                              @Parameter(description = "类型(接口在 设置相关接口-账户明细类型)") Integer cateId){
         Long userId = LoginHelper.getUserId();
         List<AccountDetailsAppVo> res = accountChangeLogService.pageApp(query,cateId,userId);
         return R.ok(res);
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/commom/setting/CateSelectVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/commom/setting/CateSelectVo.java
new file mode 100644
index 00000000..2818b25f
--- /dev/null
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/commom/setting/CateSelectVo.java
@@ -0,0 +1,17 @@
+package com.ruoyi.cai.dto.commom.setting;
+
+import lombok.Data;
+
+@Data
+public class CateSelectVo {
+    private Integer cateId;
+    private String text;
+
+    public CateSelectVo(Integer cateId, String text) {
+        this.cateId = cateId;
+        this.text = text;
+    }
+
+    public CateSelectVo() {
+    }
+}
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountChangeLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountChangeLogServiceImpl.java
index 3cc5c6a7..96b6fc40 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountChangeLogServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountChangeLogServiceImpl.java
@@ -135,6 +135,9 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
 
     @Override
     public List<AccountDetailsAppVo> pageApp(PageQuery query, Integer cateId, Long userId) {
+        if(cateId == 0){
+            cateId = null;
+        }
         Page<AccountChangeLog> page = this.page(query.build(),
                 Wrappers.lambdaQuery(AccountChangeLog.class)
                 .eq(AccountChangeLog::getUserId,userId)