From 888da8f97aab268eeac73078c9eccb6056de4739 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 八月 2025 15:52:28 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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..32da855 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
@@ -112,15 +112,15 @@
}
@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(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());
@@ -131,7 +131,7 @@
// 使用 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