From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:48 +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 | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 bd829f2..da55753 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
@@ -171,19 +171,29 @@
@PostMapping("/userCoupon/queryUserCouponById")
public UserCoupon queryUserCouponById(@RequestBody QueryUserCouponByIdAndUserId userCouponByIdAndUserId){
try {
- UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getCouponId,userCouponByIdAndUserId.getId()).eq(UserCoupon::getUserId,userCouponByIdAndUserId.getUserId()));
+ UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getId,userCouponByIdAndUserId.getId()).eq(UserCoupon::getUserId,userCouponByIdAndUserId.getUserId()));
return userCoupon;
}catch (Exception e){
e.printStackTrace();
return null;
}
}
-
+ @Autowired
+ private ICouponService couponService;
@PostMapping("/userCoupon/sendUserCoupon")
public void sendUserCoupon(@RequestBody SendCouponReq sendCouponReq){
try {
String couponIds = sendCouponReq.getCouponIds();
for (String s : couponIds.split(",")) {
+ Coupon coupon = couponService.getById(s);
+ //查询该优惠卷的数量够不够
+ List<Integer> queryIds = new ArrayList<>();
+ queryIds.add(coupon.getId());
+ int counts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", s));
+ if (coupon.getQuantityIssued()<=counts){
+ continue;
+ }
+
UserCoupon userCoupon = new UserCoupon();
userCoupon.setCouponId(Integer.valueOf(s));
userCoupon.setUserId(sendCouponReq.getUserId());
@@ -205,6 +215,7 @@
@PostMapping("/userCoupon/updateUserCoupon")
public void updateUserCoupon(@RequestBody UserCoupon userCoupon){
try {
+ userCoupon.setUserId(null);
userCouponService.updateById(userCoupon);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1