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-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 fc7cf21..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
@@ -27,10 +27,8 @@
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.CouponRecordQuery;
import com.dsh.activity.model.VipDetailVO;
-import com.dsh.activity.model.request.CommodityRequest;
-import com.dsh.activity.model.request.CouponDataVo;
-import com.dsh.activity.model.request.CouponPackageReq;
-import com.dsh.activity.model.request.VipDetailDto;
+import com.dsh.activity.model.VipPaymentVO;
+import com.dsh.activity.model.request.*;
import com.dsh.activity.model.response.CouponPackageResp;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
@@ -102,18 +100,21 @@
@Resource
private StudentClient studentClient;
+ @Resource
+ private PointsMerchandiseService pointsMerchandiseService;
@PostMapping("/base/coupon/vipDetail")
@ResponseBody
- List<VipDetailVO> vipDetail(VipDetailDto vipDetailDto){
+ 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())
@@ -135,13 +136,22 @@
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