钱包明细

miniapp/src/main/java/com/kym/miniapp/controller/AccountController.java

@@ -1,6 +1,11 @@
 package com.kym.miniapp.controller;
 
+import com.kym.common.R;
+import com.kym.service.miniapp.WalletDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -12,7 +17,15 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-08-07
  */
 @RestController
-@RequestMapping("/account")
+@RequestMapping("/api/account/")
 public class AccountController {
 
+    @Autowired
+    private WalletDetailService walletDetailService;
+
+    @GetMapping("/walletDetail")
+    public R walletDetail(@RequestParam(name = "type", defaultValue = "0",required = false) int type) {
+        return R.success(walletDetailService.listWalletDetail(type));
+    }
+
 }

miniapp/src/main/java/com/kym/miniapp/controller/WalletDetailController.java

@@ -1,18 +0,0 @@
-package com.kym.miniapp.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 用户账户表 前端控制器
- * </p>
- *
- * @author skyline
- * @since 2023-08-09
- */
-@RestController
-@RequestMapping("/wallet-detail")
-public class WalletDetailController {
-
-}

service/src/main/java/com/kym/service/miniapp/AccountService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
-import com.kym.entity.miniapp.Account;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.miniapp.Account;
 
 /**
  * <p>
@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface AccountService extends IService<Account> {
 
     Account getAccountByUserId(Long userId);
+
 }

service/src/main/java/com/kym/service/miniapp/WalletDetailService.java

@@ -3,6 +3,8 @@ package com.kym.service.miniapp;
 import com.kym.entity.miniapp.WalletDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户账户表 服务类
@@ -15,4 +17,5 @@ public interface WalletDetailService extends IService<WalletDetail> {
 
     WalletDetail getWalletDetailByOrderNo(String orderNo);
 
+    List<WalletDetail> listWalletDetail(int type);
 }

service/src/main/java/com/kym/service/miniapp/impl/AccountServiceImpl.java

@@ -1,10 +1,12 @@
 package com.kym.service.miniapp.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.miniapp.Account;
 import com.kym.mapper.miniapp.AccountMapper;
 import com.kym.service.miniapp.AccountService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kym.service.miniapp.WalletDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,11 +18,16 @@ import org.springframework.stereotype.Service;
  * @since 2023-08-07
  */
 @Service
-@DS("db-admin")
+@DS("db-miniapp")
 public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements AccountService {
+
+    @Autowired
+    private WalletDetailService walletDetailService;
+
     @Override
-    public Account getAccountByUserId(Long userId){
+    public Account getAccountByUserId(Long userId) {
         return getOne(lambdaQuery().eq(Account::getUserId, userId));
     }
 
+
 }

service/src/main/java/com/kym/service/miniapp/impl/WalletDetailServiceImpl.java

@@ -1,11 +1,14 @@
 package com.kym.service.miniapp.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.miniapp.WalletDetail;
 import com.kym.mapper.miniapp.WalletDetailMapper;
 import com.kym.service.miniapp.WalletDetailService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户账户表 服务实现类
@@ -22,4 +25,17 @@ public class WalletDetailServiceImpl extends ServiceImpl<WalletDetailMapper, Wal
     public WalletDetail getWalletDetailByOrderNo(String orderNo) {
         return getOne(lambdaQuery().eq(WalletDetail::getOrderNo, orderNo));
     }
+
+    @Override
+    public List<WalletDetail> listWalletDetail(int type) {
+        var userId = StpUtil.getLoginIdAsLong();
+        if (type > 0) {
+            return lambdaQuery().eq(WalletDetail::getUserId, userId).eq(WalletDetail::getType, type).list();
+
+        } else {
+            return lambdaQuery().eq(WalletDetail::getUserId, userId).list();
+        }
+
+    }
+
 }