From 28a60b0977d66b75fb9a2c3306840bc18ec271f6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 17:51:18 +0800
Subject: [PATCH] 会员支付相关
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 73af208..dea4e5b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -100,6 +100,8 @@
@Resource
private StudentClient studentClient;
+ @Resource
+ private PointsMerchandiseService pointsMerchandiseService;
@@ -107,11 +109,12 @@
@PostMapping("/base/coupon/vipDetail")
@ResponseBody
List<VipDetailVO> vipDetail(@RequestBody VipDetailDto vipDetailDto){
+ List<PointsMerchandise> pointsMerchandiseList = pointsMerchandiseService.list();
List<VipDetailVO> vipDetailVOS = new ArrayList<>();
List<VipDetail> list = vipDetailService.lambdaQuery()
- .in(!vipDetailDto.getVipIds().isEmpty(), VipDetail::getVipId, vipDetailDto.getVipIds())
- .in(!vipDetailDto.getUserIds().isEmpty(), VipDetail::getAppUserId, vipDetailDto.getUserIds())
- .in(!vipDetailDto.getStoreIds().isEmpty(), VipDetail::getUseStoreId, vipDetailDto.getStoreIds())
+ .in(vipDetailDto.getVipIds()!=null&&!vipDetailDto.getVipIds().isEmpty(), VipDetail::getVipId, vipDetailDto.getVipIds())
+ .in(vipDetailDto.getUserIds()!=null&&!vipDetailDto.getUserIds().isEmpty(), VipDetail::getAppUserId, vipDetailDto.getUserIds())
+ .in(vipDetailDto.getStoreIds()!=null&&!vipDetailDto.getStoreIds().isEmpty(), VipDetail::getUseStoreId, vipDetailDto.getStoreIds())
.ge(StringUtils.hasLength(vipDetailDto.getStartTime()), VipDetail::getInsertTime, vipDetailDto.getStartTime())
.le(StringUtils.hasLength(vipDetailDto.getEndTime()), VipDetail::getInsertTime, vipDetailDto.getEndTime())
.ge(StringUtils.hasLength(vipDetailDto.getUseStartTime()), VipDetail::getUseTime, vipDetailDto.getUseStartTime())
@@ -133,7 +136,16 @@
if (coupon!=null){
vipDetailVO.setTicketName(coupon.getName());
vipDetailVO.setGoodsName(coupon.getName());
+ if (coupon.getType()==4){
+ // 查询抵扣商品
+ PointsMerchandise pointsMerchandise1 = pointsMerchandiseList.stream().filter(pointsMerchandise -> pointsMerchandise.getId().equals(coupon.getGoodsId()))
+ .findFirst().orElse(null);
+ if (pointsMerchandise1 != null){
+ vipDetailVO.setGoodsName(pointsMerchandise1.getName());
+ }
+ }
}
+
}
}
return vipDetailVOS;
--
Gitblit v1.7.1