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/UserCouponController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index da55753..7df8685 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -178,14 +178,37 @@
return null;
}
}
+
+ @ResponseBody
+ @PostMapping("/userCoupon/queryUserCouponById1")
+ public UserCoupon queryUserCouponById1(@RequestBody Long id){
+ try {
+ UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getId,id));
+ return userCoupon;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
@Autowired
private ICouponService couponService;
+
+ @PostMapping("/userCoupon/edit")
+ public void edit(@RequestBody UserCoupon userCoupon) {
+ userCoupon.setUserId(null);
+ userCouponService.updateById(userCoupon);
+
+ }
+
@PostMapping("/userCoupon/sendUserCoupon")
public void sendUserCoupon(@RequestBody SendCouponReq sendCouponReq){
try {
String couponIds = sendCouponReq.getCouponIds();
for (String s : couponIds.split(",")) {
Coupon coupon = couponService.getById(s);
+ if (new Date().before(coupon.getStartTime())&&new Date().after(coupon.getEndTime())){
+ continue;
+ }
//查询该优惠卷的数量够不够
List<Integer> queryIds = new ArrayList<>();
queryIds.add(coupon.getId());
--
Gitblit v1.7.1