From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 08a1523..4adfd22 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
@@ -44,6 +44,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -106,7 +108,7 @@
@ResponseBody
@PostMapping("/coupon/queryCouponByUser/{userId}")
public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
- List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2).eq("userPopulation",2)
+ List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
.le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
.eq("state", 1));
@@ -180,6 +182,35 @@
}
+ @Autowired
+ private UserCouponService userCouponService;
+ @ResponseBody
+ @PostMapping("/coupon/queryCouponByUid")
+ public List<Coupon> queryCouponByUid(@RequestBody Integer uid){
+ try {
+ LocalDateTime currentTime = LocalDateTime.now();
+ LocalDateTime oneMinuteAgo = currentTime.minusSeconds(20);
+
+ List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", uid).ge("insertTime", oneMinuteAgo));
+ List<Integer> ids = new ArrayList<>();
+ for (UserCoupon userCoupon : list) {
+ ids.add(userCoupon.getCouponId());
+ }
+
+ if (ids.size()>0){
+ List<Coupon> userId = couponService.list(new QueryWrapper<Coupon>().in("id",ids));
+ return userId;
+
+ }
+
+ return null;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
/**
* 我的券包列表
* @param req
--
Gitblit v1.7.1