From ec2e9d15da0b196267a6b490bbe765b408d273f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:02 +0800
Subject: [PATCH] bug修改

---
 cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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..887ad12 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";
     }
@@ -124,9 +125,13 @@
         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);
+        }
         if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==1){
             payStatus.add(3);
         }
+        vipPaymentLambdaQueryWrapper.orderByDesc(VipPayment::getInsertTime);
         List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
         // 使用 Stream + 手动拷贝提升性能和可读性(或使用 MapStruct)
         vipPaymentListVOS = list.stream().map(vipDetail -> {

--
Gitblit v1.7.1