From 955b0ea6a5219997345fc9812319ed961302cd88 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 17:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 00de185..82a2c24 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
@@ -85,7 +86,9 @@
if (vo.getCouponType()==4){
List<String> goodNames = new ArrayList<>();
if (vo.getForGoodIds().equals("-1")){
- goodNames.add("全部商品");
+ List<Goods> data1 = goodsClient.getAllGoods().getData();
+ List<String> collect = data1.stream().map(Goods::getName).collect(Collectors.toList());
+ goodNames.addAll(collect);
}else{
String[] split = vo.getForGoodIds().split(",");
R<List<Goods>> goodsById = goodsClient.getGoodsById(split);
@@ -98,8 +101,6 @@
}
}
-
-
record.setCouponInfoVo(vo);
if (record.getUseTime()==null){
record.setStatus(1);
@@ -109,7 +110,6 @@
}else {
record.setStatus(2);
}
-
AppUser appUser = appUserService.getById(record.getAppUserId());
record.setUserName(appUser.getName());
@@ -149,8 +149,6 @@
}
}
-
-
record.setCouponInfoVo(vo);
if (record.getUseTime()==null){
record.setStatus(1);
@@ -160,7 +158,6 @@
}else {
record.setStatus(2);
}
-
AppUser appUser = appUserService.getById(record.getAppUserId());
record.setUserName(appUser.getName());
@@ -184,6 +181,16 @@
if (data==null){
return R.fail("当前优惠券不存在，请刷新后重试");
}
+ long count = userCouponService.count(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getCouponId, couponId).eq(UserCoupon::getDelFlag, 0));
+ if(data.getSendNum() <= count){
+ return R.fail("当前优惠券已全部领取完毕");
+ }
+ count = userCouponService.count(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getCouponId, couponId)
+ .eq(UserCoupon::getAppUserId, userid).eq(UserCoupon::getDelFlag, 0));
+ if(data.getMaxNum() <= count){
+ return R.fail("当前优惠券已达到最大领取限制");
+ }
+
if (data.getSendType()!=1&& byId.getLavePoint().compareTo(data.getNeedPoint().intValue()) < 0){
return R.fail("当前积分不足，兑换失败");
}
@@ -201,7 +208,7 @@
appUserService.updateById(byId);
UserPoint userPoint = new UserPoint();
- userPoint.setType(4);
+ userPoint.setType(11);
userPoint.setHistoricalPoint(lavePoint);
userPoint.setVariablePoint(point);
userPoint.setBalance(byId.getLavePoint());
@@ -321,5 +328,28 @@
userCouponService.updateById(userCoupon);
return R.ok();
}
+
+
+ /**
+ * 获取用户优惠券详情
+ * @param id
+ * @return
+ */
+ @PostMapping("/getUserCoupon")
+ public R<UserCoupon> getUserCoupon(@RequestParam("id") Long id){
+ UserCoupon userCoupon = userCouponService.getById(id);
+ return R.ok(userCoupon);
+ }
+
+
+ /**
+ * 编辑用户优惠券
+ * @return
+ */
+ @PostMapping("/editUserCoupon")
+ public R editUserCoupon(@RequestBody UserCoupon userCoupon){
+ userCouponService.updateById(userCoupon);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1