This commit is contained in:
dute7liang
2023-12-30 20:14:46 +08:00
parent 53aef29552
commit 065cac5ae3
15 changed files with 270 additions and 45 deletions

View File

@@ -80,24 +80,4 @@ public class UserAppController {
return R.ok(userAlbumService.resetAlbum(res,LoginHelper.getUserId()));
}
@GetMapping("/recharge/log")
@Operation(summary = "充值记录-分页")
public TableDataInfo<AccountRechargeVo> rechargeLog(PageQuery query){
Long userId = LoginHelper.getUserId();
Page<CaiAccountRecharge> page = caiAccountRechargeService.page(query.build(), Wrappers.lambdaQuery(CaiAccountRecharge.class)
.eq(CaiAccountRecharge::getUserId, userId)
.orderByDesc(CaiAccountRecharge::getCreateTime));
return TableDataInfo.build(page,AccountRechargeVo::new);
}
@GetMapping("/cash/log")
@Operation(summary = "提现记录-分页")
public TableDataInfo<AccountCashVo> cashLog(PageQuery query){
Long userId = LoginHelper.getUserId();
Page<CaiAccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class)
.eq(CaiAccountCash::getUserId, userId)
.orderByDesc(CaiAccountCash::getCreateTime));
return TableDataInfo.build(page,AccountCashVo::new);
}
}

View File

@@ -1,11 +1,20 @@
package com.ruoyi.cai.controller.app;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.CaiAccountBankcard;
import com.ruoyi.cai.domain.CaiAccountCash;
import com.ruoyi.cai.domain.CaiAccountRecharge;
import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes;
import com.ruoyi.cai.dto.app.query.WithdrawReq;
import com.ruoyi.cai.dto.app.vo.AccountCashVo;
import com.ruoyi.cai.dto.app.vo.AccountRechargeVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.CaiAccountCashService;
import com.ruoyi.cai.service.CaiAccountRechargeService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.helper.LoginHelper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,6 +30,8 @@ public class WalletController {
private CurrentUserManager currentUserManager;
@Autowired
private CaiAccountCashService accountCashService;
@Autowired
private CaiAccountRechargeService accountRechargeService;
@GetMapping("/aliInfo")
@Operation(summary = "获取绑定支付宝信息")
@@ -44,4 +55,24 @@ public class WalletController {
return R.ok(true);
}
@GetMapping("/recharge/log")
@Operation(summary = "充值记录-分页")
public TableDataInfo<AccountRechargeVo> rechargeLog(PageQuery query){
Long userId = LoginHelper.getUserId();
Page<CaiAccountRecharge> page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(CaiAccountRecharge.class)
.eq(CaiAccountRecharge::getUserId, userId)
.orderByDesc(CaiAccountRecharge::getCreateTime));
return TableDataInfo.build(page,AccountRechargeVo::new);
}
@GetMapping("/cash/log")
@Operation(summary = "提现记录-分页")
public TableDataInfo<AccountCashVo> cashLog(PageQuery query){
Long userId = LoginHelper.getUserId();
Page<CaiAccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class)
.eq(CaiAccountCash::getUserId, userId)
.orderByDesc(CaiAccountCash::getCreateTime));
return TableDataInfo.build(page,AccountCashVo::new);
}
}