From 79bbee5adf0071808a33c09d5f87c5573d83cb3b Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 21 十一月 2023 19:44:15 +0800
Subject: [PATCH] 11.21。1

---
 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