ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -31,6 +31,12 @@ throw new RuntimeException("编辑用户信息失败"); } @Override public R<Long> getCouponCount(Long userId, Long couponId) { log.error("获取优惠券数量失败：{}", cause.getMessage()); throw new RuntimeException("获取优惠券数量失败"); } }; } } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -28,4 +28,7 @@ */ @PostMapping("/appUser/editAppUserById") R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser); @PostMapping("/appUser/getCouponCount") R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId ); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -1,10 +1,15 @@ package com.ruoyi.account.controller; import java.math.BigDecimal; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.model.AppUser; import com.ruoyi.account.api.model.UserCoupon; import com.ruoyi.account.api.model.UserPoint; import com.ruoyi.account.api.vo.CouponInfoVo; import com.ruoyi.account.service.AppUserService; import com.ruoyi.account.service.UserCouponService; import com.ruoyi.account.service.UserPointService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -37,10 +42,17 @@ @Resource private CouponClient couponClient; @Resource private AppUserService appUserService; @Resource private UserPointService userPointService; @PostMapping("/mine/list") @ApiOperation(value = "已领取列表", tags = {"小程序-首页-优惠劵"}) @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵"}) public R<Page<UserCoupon>> minelist(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status) { Long userid = tokenService.getLoginUserApplet().getUserid(); Page<UserCoupon> page = userCouponService.lambdaQuery() @@ -66,6 +78,57 @@ } @PostMapping("/get") @ApiOperation(value = "领取或者兑换优惠券", tags = {"小程序-个人中心-优惠劵"}) public R<Page<UserCoupon>> get(@RequestParam Integer couponId) { Long userid = tokenService.getLoginUserApplet().getUserid(); AppUser byId = appUserService.getById(userid); CouponInfo data = couponClient.detail(couponId).getData(); //检验当前优惠券是否存在 if (data==null){ return R.fail("当前优惠券不存在，请刷新后重试"); } if (data.getSendType()!=1&&byId.getLavePoint().compareTo(data.getNeedPoint())==-1){ return R.fail("当前积分不足，兑换失败"); } //检验发放时间 LocalDateTime now = LocalDateTime.now(); if (now.isBefore(data.getSendStartTime())||now.isAfter(data.getSendEndTime())){ return R.fail("领取失败，不在发放有效期"); } //如果是积分兑换，增加积分的历史记录 if (data.getSendType()!=1){ UserPoint userPoint = new UserPoint(); userPoint.setType(4); userPoint.setHistoricalPoint(byId.getLavePoint()); userPoint.setVariablePoint(data.getNeedPoint()); userPoint.setAppUserId(userid); userPoint.setObjectId(Long.valueOf(data.getId())); userPointService.save(userPoint); //扣除积分 byId.setLavePoint(byId.getLavePoint().subtract(userPoint.getVariablePoint())); appUserService.updateById(byId); } //增加优惠券记录,根据时间类型设置开始结束时间 UserCoupon userCoupon = new UserCoupon(); userCoupon.setAppUserId(userid); if (data.getPeriodType()==1) { userCoupon.setStartTime(data.getPeriodStartTime()); userCoupon.setEndTime(data.getPeriodEndTime()); }else { userCoupon.setStartTime(now); userCoupon.setEndTime(now.plusDays(data.getPeriodDays())); } userCoupon.setCouponId(data.getId()); userCouponService.save(userCoupon); return R.ok(); }
@@ -1,7 +1,10 @@ package com.ruoyi.other.controller; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.AppUser; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.Banner; import com.ruoyi.other.api.domain.CouponInfo; import com.ruoyi.other.service.CouponInfoService; @@ -12,6 +15,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; /** * <p> @@ -26,6 +32,10 @@ public class CouponInfoController { @Resource private CouponInfoService couponInfoService; @Resource private TokenService tokenService; @Resource private AppUserClient appUserClient; //查看详情 @PostMapping("/detail") @ApiOperation(value = "详情", tags = {"后台-优惠劵"}) @@ -34,5 +44,37 @@ return R.ok(byId); } @PostMapping("/gift/list") @ApiOperation(value = "待领取列表", tags = {"小程序-个人中心-优惠劵"}) public R<List<CouponInfo>> giftlist(){ Long userid = tokenService.getLoginUserApplet().getUserid(); AppUser appUserById = appUserClient.getAppUserById(userid); LocalDateTime now = LocalDateTime.now(); //查出全部可领取的优惠劵 List<CouponInfo> list = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 1).list(); //查出指定人员可领取优惠券 List<CouponInfo> list1 = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 2).apply("FIND_IN_SET('" + appUserById.getId() + "', person_ids)").list(); //查出指定会员可领取优惠劵 List<CouponInfo> list2 = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 3).apply("FIND_IN_SET('" + appUserById.getVipId() + "', person_ids)").list(); List<CouponInfo> returnList= new ArrayList<>(); count(userid, list, returnList); count(userid, list1, returnList); count(userid, list2, returnList); return R.ok(returnList); } private void count(Long userid, List<CouponInfo> list1, List<CouponInfo> returnList) { for (CouponInfo couponInfo : list1) { Long count = appUserClient.getCouponCount(userid, couponInfo.getId()).getData(); couponInfo.setMaxNum(couponInfo.getMaxNum()-count.intValue()); for (int i = 0; i < couponInfo.getMaxNum(); i++) { returnList.add(couponInfo); } } } }
