From 75d8795d4a8444071f348be4082455f2ca078ffe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 11 +++++++----
1 files changed, 7 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 c862916..01f71db 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
@@ -122,8 +122,7 @@
// 优惠券已领取数量
int couponId = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
// 用户已领取该优惠券数量
- int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()
- ).eq("userId", userId));
+ int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()).eq("userId", userId));
if (couponId >= quantityIssued) {
continue;
}
@@ -607,12 +606,15 @@
coupon.setIllustrate(dataVo.getIllustrate());
coupon.setDistributionMethod(dataVo.getDistributionMethod());
coupon.setRedemptionMethod(dataVo.getExchangeMethod());
- if (dataVo.getExchangeMethod() != null) {
+ if (dataVo.getExchangeMethod() != null&&dataVo.getDistributionMethod()!=4) {
switch (dataVo.getExchangeMethod()) {
case 1:
coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
break;
-
+ case 2:
+ coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ coupon.setCash(dataVo.getRequiredCash());
+ break;
case 3:
coupon.setCash(dataVo.getRequiredCash());
break;
@@ -761,6 +763,7 @@
}
return true;
} catch (Exception e) {
+ e.printStackTrace();
return false;
}
}
--
Gitblit v1.7.1