From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 9d646c1..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,33 +105,42 @@
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";
}
@ResponseBody
- @RequestMapping("/finance/vipPayment")
+ @PostMapping("/finance/vipPayment")
List<VipPaymentListVO> vipPayment(@RequestBody VipPaymentDto vipPaymentDto){
List<VipPaymentListVO> vipPaymentListVOS = new ArrayList<>();
List<Integer> payStatus = new ArrayList<>();
- payStatus.add(2);
LambdaQueryWrapper<VipPayment> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
- vipPaymentLambdaQueryWrapper.in(!vipPaymentDto.getUserIds().isEmpty(),VipPayment::getAppUserId, vipPaymentDto.getUserIds());
- vipPaymentLambdaQueryWrapper.in(!vipPaymentDto.getVipIds().isEmpty(),VipPayment::getVipId, vipPaymentDto.getVipIds());
- vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
+ 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.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 -> {
VipPaymentListVO vo = new VipPaymentListVO();
- BeanUtils.copyProperties(vo, vipDetail); // 注意参数顺序是否正确
+ BeanUtils.copyProperties(vipDetail,vo); // 注意参数顺序是否正确
return vo;
}).collect(Collectors.toList());
for (VipPaymentListVO vipPaymentListVO : vipPaymentListVOS) {
--
Gitblit v1.7.1