From 27ce12d3ed00ed5d70ce785653a16db092c3ef88 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 21:33:27 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index 32da855..0b173ea 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -105,8 +105,9 @@
if (parse.before(new Date())){
appUser.setIsVip(0);
}
+ vipPayment.setRemark(vipRefundDto.getRemark());
appUserService.updateById(appUser);
- vipPayment.setState(3);
+ vipPayment.setPayStatus(3);
vipPaymentService.updateById(vipPayment);
return "200";
}
@@ -117,16 +118,24 @@
List<VipPaymentListVO> vipPaymentListVOS = new ArrayList<>();
List<Integer> payStatus = new ArrayList<>();
- payStatus.add(2);
LambdaQueryWrapper<VipPayment> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
vipPaymentLambdaQueryWrapper.in(vipPaymentDto.getUserIds()!=null&&!vipPaymentDto.getUserIds().isEmpty(),VipPayment::getAppUserId, vipPaymentDto.getUserIds());
vipPaymentLambdaQueryWrapper.in(vipPaymentDto.getVipIds()!=null&&!vipPaymentDto.getVipIds().isEmpty(),VipPayment::getVipId, vipPaymentDto.getVipIds());
- vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
vipPaymentLambdaQueryWrapper.ge(StringUtils.hasLength(vipPaymentDto.getStartTime()), VipPayment::getInsertTime, vipPaymentDto.getStartTime());
vipPaymentLambdaQueryWrapper.le(StringUtils.hasLength(vipPaymentDto.getEndTime()), VipPayment::getInsertTime, vipPaymentDto.getEndTime());
+ if (vipPaymentDto.getIsRefund()==null){
+ payStatus.add(3);
+ payStatus.add(2);
+ }
if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==1){
payStatus.add(3);
}
+ if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==2){
+ payStatus.add(2);
+ }
+ vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
+
+ vipPaymentLambdaQueryWrapper.orderByDesc(VipPayment::getInsertTime);
List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
// 使用 Stream + 手动拷贝提升性能和可读性（或使用 MapStruct）
vipPaymentListVOS = list.stream().map(vipDetail -> {
--
Gitblit v1.7.1