From 3a0a98d3ea6f852eff758413e5e7ec36e1e06404 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 17 八月 2024 15:31:17 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index cbcd8b3..f36cca6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -87,6 +87,8 @@
}else{
record.setMeetTheConditions("满"+byId.getMeetTheConditions()+"元可用");
}
+ record.setCoverPicture(byId.getCoverPicture());
+ record.setDetailsPicture(byId.getDetailsPicture());
}
}
return AjaxResult.ok(data);
@@ -124,31 +126,20 @@
TCoupon byId = tCouponService.getById(couponListVOVO.getCouponId());
BeanUtils.copyProperties(byId,couponListVOVO);
couponListVOVO.setCouponName(byId.getName());
- // 根据预付金额 判断是否满足
- if (byId.getMeetTheConditions().compareTo(BigDecimal.ZERO) == 0){
- // 无门槛
- couponListVOVO.setIsUse(1);
- }else if (couponListVOVO.getPayMoney().compareTo(byId.getMeetTheConditions()) < 0){
- couponListVOVO.setIsUse(0);
- }else{
- couponListVOVO.setIsUse(1);
- }
- // 根据优惠券类型和预付金额 判断哪一个优惠券减免的金额最大 将其排在第一位
- if (couponListVOVO.getIsUse() == 1){
- switch (byId.getPreferentialMode()){
- case 1:
- couponListVOVO.setMoney(byId.getDiscountAmount());
- break;
- case 2:
-
- break;
- }
- }else{
- couponListVOVO.setMoney(BigDecimal.ZERO);
- }
-
}
return R.ok(list);
}
+
+
+ /**
+ * 根据id获取优惠券信息
+ * @param id
+ * @return
+ */
+ @PostMapping(value = "/getCouponById/{id}")
+ public R<TCoupon> getCouponById(@PathVariable Integer id){
+ TCoupon coupon = tCouponService.getById(id);
+ return R.ok(coupon);
+ }
}
--
Gitblit v1.7.1