From 94f34a5cf9ab374afbaefd566bc0a3dc8a4616dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:37 +0800
Subject: [PATCH] 同步
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 4d0e203..18f5a97 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
@@ -107,8 +107,8 @@
*/
@ResponseBody
@PostMapping("/coupon/queryCouponByUser/{userId}")
- public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
-
+ public List<Long> queryCouponByUser(@PathVariable("userId") Integer userId){
+ List<Long> ids = new ArrayList<>();
System.err.println("到达了赠送优惠价");
List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
.le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
@@ -137,8 +137,9 @@
userCoupon.setStatus(1);
userCoupon.setInsertTime(new Date());
ucService.save(userCoupon);
+ ids.add(userCoupon.getId());
}
- return null;
+ return ids;
}
@ResponseBody
@@ -652,7 +653,7 @@
}
if (dataVo.getUserType() == 3){
coupon.setPublisherType(3);
- coupon.setAuditStatus(2);
+ coupon.setAuditStatus(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
--
Gitblit v1.7.1