abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]删除member参数，改为从token中获取

Browse Source
This commit is contained in:
wangqx 2025-08-16 10:05:51 +08:00
parent ccadf33e19
commit 90be00a277
6 changed files with 107 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java
View File

@ -21,7 +21,7 @@ public class AppArticleController {
private final IArticleService service;
@Tag(name = "轮播列表")
@PostMapping("/carousel")
@PostMapping("/carousel/")
public R<List<ArticleVO>> carousel(@RequestBody ArticleBO bo) {
bo.setType(1);//轮播图
bo.setCategoryId(1l);

106
ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java
View File

@ -3,18 +3,35 @@ package org.dromara.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.member.convert.AccountBillConvert;
import com.wzj.soopin.member.convert.MemberAccountConvert;
import com.wzj.soopin.member.convert.MemberBankConvert;
import com.wzj.soopin.member.convert.MemberConvert;
import com.wzj.soopin.member.domain.bo.AccountBillBO;
import com.wzj.soopin.member.domain.bo.MemberBankBO;
import com.wzj.soopin.member.domain.po.AccountBill;
import com.wzj.soopin.member.domain.po.Member;
import com.wzj.soopin.member.domain.po.MemberAccount;
import com.wzj.soopin.member.domain.po.MemberBank;
import com.wzj.soopin.member.domain.vo.AccountBillVO;
import com.wzj.soopin.member.domain.vo.MemberAccountVO;
import com.wzj.soopin.member.domain.vo.MemberBankVO;
import com.wzj.soopin.member.domain.vo.MemberVO;
import com.wzj.soopin.member.service.IAccountBillService;
import com.wzj.soopin.member.service.IMemberAccountService;
import com.wzj.soopin.member.service.IMemberBankService;
import com.wzj.soopin.member.service.IMemberService;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.SocialLoginBody;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.springframework.web.bind.annotation.*;
@RestController
@ -34,28 +51,95 @@ public class AppMemberController {
private final IAccountBillService accountBillService;
private final AccountBillConvert accountBillConvert;
private final SocialProperties socialProperties;
private final IMemberBankService memberBankService;
private final MemberBankConvert memberBankConvert;
@Tag(name ="获取会员账户信息详细信息")
@GetMapping(value = "/member/{id}")
public R<MemberVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
@Tag(name = "获取会员账户信息详细信息")
@GetMapping(value = "/info")
public R<MemberVO> getInfo() {
//获取用户信息
LoginUser loginUser = LoginHelper.getLoginUser();
if (loginUser == null) {
throw new ServiceException("用户未登录");
}
return R.ok(convert.toVO(service.getById(loginUser.getUserId())));
}
@Tag(name ="获取会员账户表详细信息")
@GetMapping(value = "/account/{memberId}")
public R<MemberAccountVO> accountInfo(@PathVariable("memberId") Long memberId) {
return R.ok(accountConvert.toVO(accountService.getMemberAccount(memberId)));
@Tag(name = "获取会员账户表详细信息")
@GetMapping(value = "/account")
public R<MemberAccountVO> accountInfo() {
//获取用户信息
LoginUser loginUser = LoginHelper.getLoginUser();
if (loginUser == null) {
throw new ServiceException("用户未登录");
}
return R.ok(accountConvert.toVO(accountService.getMemberAccount(loginUser.getUserId())));
}
@Tag(name = "查询账单")
@PostMapping("/bank")
public R<Page<MemberBankVO>> list(@RequestBody MemberBankBO bo,
@RequestBody Page<MemberBank> page) {
//获取用户信息
LoginUser loginUser = LoginHelper.getLoginUser();
if (loginUser == null) {
throw new ServiceException("用户未登录");
}
Long memberId = loginUser.getUserId();
bo.setMemberId(memberId);
Page<MemberBank> memberPage = memberBankService.page(page, bo.toWrapper());
return R.ok(memberBankConvert.toVO(memberPage));
}
@Tag(name = "查询账单")
@PostMapping("/bills")
public R<Page<AccountBillVO>> list(@RequestBody AccountBillBO bo,
@RequestBody Page<AccountBill> page) {
Page<AccountBill> memberPage = accountBillService.page(page,bo.toWrapper());
@RequestBody Page<AccountBill> page) {
//获取用户信息
LoginUser loginUser = LoginHelper.getLoginUser();
if (loginUser == null) {
throw new ServiceException("用户未登录");
}
Long memberId = loginUser.getUserId();
//根据会员获取账户信息
MemberAccount memberAccount = accountService.getMemberAccount(memberId);
if (memberAccount == null) {
throw new ServiceException("用户未绑定账户");
}
bo.setAccountId(memberAccount.getId());
Page<AccountBill> memberPage = accountBillService.page(page, bo.toWrapper());
return R.ok(accountBillConvert.toVO(memberPage));
}
@Tag(name = "绑定微信")
@PostMapping("/bind/wechat")
public R<AuthUser> bindWechat(@RequestBody SocialLoginBody loginBody) {
//获取用户信息
LoginUser loginUser = LoginHelper.getLoginUser();
if (loginUser == null) {
throw new ServiceException("用户未登录");
}
Long memberId = loginUser.getUserId();
ValidatorUtils.validate(loginBody);
AuthResponse<AuthUser> response = SocialUtils.loginAuth(
loginBody.getSource(), loginBody.getSocialCode(),
loginBody.getSocialState(), socialProperties);
if (!response.ok()) {
throw new ServiceException(response.getMsg());
}
AuthUser authUserData = response.getData();
Member member = Member.builder().id(memberId).openId(authUserData.getUuid()).build();
// 更新用户的微信信息
// 返回给前端
return R.ok(authUserData);
}
}

4
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBankBO.java
View File

@ -26,11 +26,15 @@ public class MemberBankBO extends BaseBO<MemberBank> {
@Schema(description ="开户行")
private String address;
@Schema(description ="会员ID")
private Long memberId;
@Override
public LambdaQueryWrapper<MemberBank> toWrapper() {
return super.toWrapper().eq(id!=null, MemberBank::getId, id)
.like(name!=null, MemberBank::getName, name)
.eq(memberId!=null, MemberBank::getMemberId, memberId)
.like(code!=null, MemberBank::getCode, code)
.like(address!=null, MemberBank::getAddress, address);
}

2
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java
View File

@ -97,7 +97,7 @@ public class Member extends BaseAudit {
private Integer friendsCount;
@Schema(description ="微信openId")
private Long openId;
private String openId;
@Schema(description ="用户id")

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberBank.java
View File

@ -26,4 +26,7 @@ public class MemberBank {
@Schema(description ="开户行")
private String address;
@Schema(description ="会员ID")
private Long memberId;
}

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberBankVO.java
View File

@ -25,4 +25,7 @@ public class MemberBankVO {
@Schema(description ="开户行")
private String address;
@Schema(description ="会员ID")
private Long memberId;
}