This commit is contained in:
dute7liang
2023-12-30 21:04:37 +08:00
parent 065cac5ae3
commit 6e56989d0f
15 changed files with 164 additions and 50 deletions

View File

@@ -1,21 +1,13 @@
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.CaiAccountCash;
import com.ruoyi.cai.domain.CaiAccountRecharge;
import com.ruoyi.cai.dto.app.query.*;
import com.ruoyi.cai.dto.app.vo.AccountCashVo;
import com.ruoyi.cai.dto.app.vo.AccountRechargeVo;
import com.ruoyi.cai.dto.app.query.AlbumAddReq;
import com.ruoyi.cai.dto.app.query.AlbumResetReq;
import com.ruoyi.cai.dto.app.query.IdRes;
import com.ruoyi.cai.dto.app.query.UserUpdateReq;
import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserAccountVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.CaiAccountCashService;
import com.ruoyi.cai.service.CaiAccountRechargeService;
import com.ruoyi.cai.service.CaiUserAlbumService;
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;
@@ -31,10 +23,6 @@ public class UserAppController {
@Autowired
private CurrentUserManager currentUserManager;
@Autowired
private CaiAccountRechargeService caiAccountRechargeService;
@Autowired
private CaiAccountCashService accountCashService;
@Autowired
private CaiUserAlbumService userAlbumService;
@GetMapping("/info")
@@ -43,24 +31,12 @@ public class UserAppController {
return R.ok(currentUserManager.currentInfo());
}
@GetMapping("/account")
@Operation(summary = "快速获取当前用户账号余额信息")
public R<UserAccountVo> currentAccount(){
return R.ok(currentUserManager.currentAccount());
}
@PostMapping("/update")
@Operation(summary = "修改当前用户信息")
public R<Boolean> userUpdate(@RequestBody UserUpdateReq res){
return R.ok(currentUserManager.userUpdate(res));
}
@PostMapping("/album/update")
@Operation(summary = "修改相册")
public R<Boolean> userAlbumDel(@RequestBody AlbumAddReq userAlbumList){
return R.ok(userAlbumService.updateAlbum(userAlbumList));
}
@PostMapping("/album/del")
@Operation(summary = "删除相册")
public R<Boolean> userAlbumDel(@RequestBody IdRes res){
@@ -75,7 +51,7 @@ public class UserAppController {
}
@PostMapping("/album/reset")
@Operation(summary = "重排序相册")
@Operation(summary = "重排序相册",hidden = true)
public R<Boolean> userAlbumAdd(@RequestBody List<AlbumResetReq> res){
return R.ok(userAlbumService.resetAlbum(res,LoginHelper.getUserId()));
}

View File

@@ -9,6 +9,7 @@ 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.dto.app.vo.user.UserAccountVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.CaiAccountCashService;
import com.ruoyi.cai.service.CaiAccountRechargeService;
@@ -33,6 +34,12 @@ public class WalletController {
@Autowired
private CaiAccountRechargeService accountRechargeService;
@GetMapping("/account")
@Operation(summary = "快速获取当前用户账号余额信息")
public R<UserAccountVo> currentAccount(){
return R.ok(currentUserManager.currentAccount());
}
@GetMapping("/aliInfo")
@Operation(summary = "获取绑定支付宝信息")
public R<CaiAccountBankcard> aliInfo(){