From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 29 十一月 2023 18:19:43 +0800
Subject: [PATCH] 11.29
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index dfc7229..90385ec 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -287,6 +287,10 @@
@Autowired
private PointsMerchandiseStoreService pointsMerchandiseStoreService;
+
+ @Autowired
+ private CouponStoreService couponStoreService;
+
@ResponseBody
@PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location) throws Exception {
@@ -324,7 +328,6 @@
}
-// if (cIds.size()>0) {
List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>().in("id", cIds)
.eq("state", 1)
@@ -341,8 +344,28 @@
integralCommodity.setSort(merchandise.getSort());
commodity.add(integralCommodity);
}
-// }
}
+
+ List<CouponStore> storeId = couponStoreService.list(new QueryWrapper<CouponStore>().eq("storeId", s.getId()));
+ List<Integer> storeCoupons = new ArrayList<>();
+ for (CouponStore couponStore : storeId) {
+ storeCoupons.add(couponStore.getCouponId());
+ }
+ List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().in("id", storeCoupons).eq("state", 1).gt("endTime", new Date()).last("ORDER BY insertTime desc"));
+ if (!list.isEmpty()){
+ for (Coupon coupon : list) {
+ IntegralCommodity integralCommodity = new IntegralCommodity();
+ integralCommodity.setCommodityId(coupon.getId());
+ integralCommodity.setCommodityImg(coupon.getCover());
+ integralCommodity.setCommodityName(coupon.getName());
+ integralCommodity.setCommodityPrice(coupon.getIntegral());
+ integralCommodity.setGoodsType(coupon.getType());
+// integralCommodity.setSort(coupon.getSort());
+ commodity.add(integralCommodity);
+ }
+
+ }
+
System.out.println(commodity);
return commodity;
@@ -898,9 +921,9 @@
list3.add(44);
detailsResponse.setRid(list3);
}else {
- ArrayList<Integer> list3 = new ArrayList<>();
- list3.add(43);
- detailsResponse.setRid(list3);
+ ArrayList<Integer> list4 = new ArrayList<>();
+ list4.add(43);
+ detailsResponse.setRid(list4);
}
}
}
--
Gitblit v1.7.1