From aad25d7e6b439a7fdc250ed6e796714464762b32 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 16:13:19 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 84 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 2 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 a08b7cf..28eb386 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;
@@ -98,7 +99,53 @@
}
}
+ record.setCouponInfoVo(vo);
+ if (record.getUseTime()==null){
+ record.setStatus(1);
+ if (record.getEndTime().isBefore(LocalDateTime.now())){
+ record.setStatus(3);
+ }
+ }else {
+ record.setStatus(2);
+ }
+ AppUser appUser = appUserService.getById(record.getAppUserId());
+ record.setUserName(appUser.getName());
+ record.setPhone(appUser.getPhone());
+ }
+ return R.ok(page);
+ }
+
+
+ @GetMapping("/mine/list1")
+ @ApiOperation(value = "已领取列表", tags = {"管理后台-优惠劵"})
+ public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status, Integer id) {
+ Page<UserCoupon> page = userCouponService.lambdaQuery()
+ .isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
+ .isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
+ .eq(UserCoupon::getCouponId, id)
+ .lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
+ for (UserCoupon record : page.getRecords()) {
+ record.setIdStr(record.getId().toString());
+ CouponInfo data = couponClient.detail(record.getCouponId()).getData();
+ CouponInfoVo vo = new CouponInfoVo();
+ BeanUtils.copyProperties(data,vo);
+ //如果是商品券，将商品名称返回
+ if (vo.getCouponType()==4){
+ List<String> goodNames = new ArrayList<>();
+ if (vo.getForGoodIds().equals("-1")){
+ goodNames.add("全部商品");
+ }else{
+ String[] split = vo.getForGoodIds().split(",");
+ R<List<Goods>> goodsById = goodsClient.getGoodsById(split);
+ if (goodsById.getData()!=null){
+ for (Goods datum : goodsById.getData()) {
+ goodNames.add(datum.getName());
+ }
+ }
+ vo.setGoodNames(goodNames);
+ }
+ }
record.setCouponInfoVo(vo);
if (record.getUseTime()==null){
@@ -110,13 +157,13 @@
record.setStatus(2);
}
-
AppUser appUser = appUserService.getById(record.getAppUserId());
record.setUserName(appUser.getName());
record.setPhone(appUser.getPhone());
}
return R.ok(page);
}
+
@GetMapping("/get")
@@ -132,6 +179,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("当前积分不足，兑换失败");
}
@@ -149,7 +206,7 @@
appUserService.updateById(byId);
UserPoint userPoint = new UserPoint();
- userPoint.setType(4);
+ userPoint.setType(11);
userPoint.setHistoricalPoint(lavePoint);
userPoint.setVariablePoint(point);
userPoint.setBalance(byId.getLavePoint());
@@ -269,5 +326,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