From 593fac40442ea9b689c864a9d020a86b3acd47dc Mon Sep 17 00:00:00 2001 From: wangqx Date: Fri, 15 Aug 2025 17:47:45 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AccountDetailController.java | 54 ----------- .../member/domain/bo/AccountBillBO.java | 3 +- .../member/domain/vo/AccountBillVO.java | 4 - .../impl/AccountDetailServiceImpl.java | 91 ------------------- .../mapper/member/AccountBillMapper.xml | 4 + .../MemberAccountChangeRecordMapper.xml | 52 ----------- 6 files changed, 6 insertions(+), 202 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/AccountDetailController.java delete mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/AccountDetailServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AccountBillMapper.xml delete mode 100644 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberAccountChangeRecordMapper.xml diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/AccountDetailController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/AccountDetailController.java deleted file mode 100644 index abb4019f3..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/AccountDetailController.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.wzj.soopin.member.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.member.domain.bo.AccountDetailQueryBO; -import com.wzj.soopin.member.domain.vo.AccountDetailVO; -import com.wzj.soopin.member.service.IAccountDetailService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import org.springframework.validation.annotation.Validated; - -/** - * 账户明细查询控制器 - */ -@Tag(name = "账户明细查询") -@RestController -@RequestMapping("/account/detail") -@RequiredArgsConstructor -public class AccountDetailController { - - private final IAccountDetailService accountDetailService; - - /** - * 分页查询账户明细 - */ - @Operation(summary = "根据account_id分页查询账户明细") - @PostMapping("/page") - public R> queryAccountDetailPage(@RequestBody AccountDetailQueryBO queryBO, - @RequestBody Page page) { - if (page != null) { - queryBO.setPageNum(page.getCurrent()); - queryBO.setPageSize(page.getSize()); - } - IPage result = accountDetailService.queryAccountDetailPage(queryBO); - return R.ok(result); - } - - /** - * 查询当前登录用户的账户明细 - */ - @Operation(summary = "查询当前登录用户的账户明细") - @PostMapping("/current") - public R> queryCurrentUserAccountDetailPage(@Validated @RequestBody AccountDetailQueryBO queryBO) { - IPage result = accountDetailService.queryCurrentUserAccountDetailPage(queryBO); - return R.ok(result); - } -} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/AccountBillBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/AccountBillBO.java index acd774a76..d8a86f1c1 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/AccountBillBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/AccountBillBO.java @@ -46,8 +46,9 @@ public class AccountBillBO extends BaseBO { @Override public LambdaQueryWrapper toWrapper() { - return new LambdaQueryWrapper() + return super.toWrapper() .eq(getChangeType() != null, AccountBill::getChangeType,changeType) + .eq(getAccountId() != null, AccountBill::getAccountId,accountId) .eq(getSource() != null, AccountBill::getSource,source); } } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java index 7f9f3e8d0..33714dec7 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java @@ -22,10 +22,6 @@ public class AccountBillVO extends BaseAudit { private Long accountId; - @Schema(description ="MEMBER_ID") - @TableId(value="member_id", type = IdType.ASSIGN_ID) - private Long memberId; - @Schema(description ="余额") @Excel(name = "余额") diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/AccountDetailServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/AccountDetailServiceImpl.java deleted file mode 100644 index 135a68978..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/AccountDetailServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.wzj.soopin.member.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.member.domain.bo.AccountDetailQueryBO; -import com.wzj.soopin.member.domain.vo.AccountDetailVO; -import com.wzj.soopin.member.enums.AccountTypeEnum; -import com.wzj.soopin.member.enums.UserTypeEnum; -import com.wzj.soopin.member.mapper.AccountBillMapper; -import com.wzj.soopin.member.service.IAccountDetailService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.core.domain.model.LoginUser; -import org.springframework.stereotype.Service; - -import java.time.format.DateTimeFormatter; -import java.util.List; - -/** - * 账户明细查询服务实现类 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AccountDetailServiceImpl implements IAccountDetailService { - - private final AccountBillMapper accountChangeRecordMapper; - - @Override - public IPage queryAccountDetailPage(AccountDetailQueryBO queryBO) { - // 构建分页对象 - Page page = new Page<>(queryBO.getPageNum(), queryBO.getPageSize()); - - // 处理时间格式 - String startTime = null; - String endTime = null; - if (queryBO.getStartTime() != null) { - startTime = queryBO.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - } - if (queryBO.getEndTime() != null) { - endTime = queryBO.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - } - - // 记录查询参数日志 - log.info("查询账户明细，参数：memberId={}, accountId={}, changeType={}, source={}, startTime={}, endTime={}", - queryBO.getMemberId(), queryBO.getAccountId(), queryBO.getChangeType(), - queryBO.getSource(), startTime, endTime); - - // 查询数据 - IPage result = accountChangeRecordMapper.selectAccountDetailPage( - page, queryBO.getMemberId(), queryBO.getAccountId(), - queryBO.getChangeType(), queryBO.getSource(), startTime, endTime - ); - - // 补充账户类型和用户类型描述 - List records = result.getRecords(); - for (AccountDetailVO record : records) { - // 设置账户类型描述 - record.setAccountTypeDesc(AccountTypeEnum.getDesc(record.getAccountType())); - - // 根据账户类型判断用户类型 - Integer userType = getUserTypeByAccountType(record.getAccountType()); - record.setUserType(userType); - record.setUserTypeDesc(UserTypeEnum.getDesc(userType)); - } - - log.info("查询账户明细完成，共查询到{}条记录", result.getTotal()); - return result; - } - - @Override - public Integer getUserTypeByAccountType(Integer accountType) { - return UserTypeEnum.getUserTypeByAccountType(accountType); - } - - @Override - public IPage queryCurrentUserAccountDetailPage(AccountDetailQueryBO queryBO) { - // 获取当前登录用户信息 - LoginUser loginUser = LoginHelper.getLoginUser(); - if (loginUser == null) { - throw new RuntimeException("用户未登录"); - } - - // 设置当前登录用户的会员ID - queryBO.setMemberId(loginUser.getUserId()); - - // 调用原有的分页查询方法 - return queryAccountDetailPage(queryBO); - } -} diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AccountBillMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AccountBillMapper.xml new file mode 100644 index 000000000..929e80d72 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AccountBillMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberAccountChangeRecordMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberAccountChangeRecordMapper.xml deleted file mode 100644 index 143751ce3..000000000 --- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberAccountChangeRecordMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - -