From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 4 +++-
1 files changed, 3 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 5fdb57d..8958ca7 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
@@ -108,6 +108,8 @@
@ResponseBody
@PostMapping("/coupon/queryCouponByUser/{userId}")
public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
+
+ 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)
.eq("state", 1));
@@ -650,7 +652,7 @@
}
if (dataVo.getUserType() == 3){
coupon.setPublisherType(3);
- coupon.setAuditStatus(2);
+ coupon.setAuditStatus(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
--
Gitblit v1.7.1