From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 113 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 5f62eed..003c5b0 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
@@ -1,6 +1,17 @@
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.account.api.vo.CouponInfoVo;
import com.ruoyi.account.api.vo.PaymentUserCoupon;
import com.ruoyi.account.service.UserCouponService;
@@ -10,6 +21,16 @@
import javax.annotation.Resource;
import java.util.List;
+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.api.feignClient.CouponClient;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
* <p>
@@ -22,9 +43,99 @@
@RestController
@RequestMapping("/user-coupon")
public class UserCouponController {
+ @Resource
+ private UserCouponService userCouponService;
+ @Resource
+ private TokenService tokenService;
- @Resource
- private UserCouponService userCouponService;
+ @Resource
+ private CouponClient couponClient;
+ @Resource
+ private AppUserService appUserService;
+
+ @Resource
+ private UserPointService userPointService;
+
+
+
+
+ @PostMapping("/mine/list")
+ @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()
+ .isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
+ .isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
+ .lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now())
+ .eq(UserCoupon::getAppUserId, userid).page(Page.of(pageNum, pageSize));
+ for (UserCoupon record : page.getRecords()) {
+ CouponInfo data = couponClient.detail(record.getCouponId()).getData();
+ CouponInfoVo vo = new CouponInfoVo();
+ BeanUtils.copyProperties(data,vo);
+ record.setCouponInfoVo(vo);
+ if (record.getUseTime()==null){
+ record.setStatus(1);
+ if (record.getEndTime().isBefore(LocalDateTime.now())){
+ record.setStatus(3);
+ }
+ }else {
+ record.setStatus(2);
+ }
+ }
+ return R.ok(page);
+ }
+
+
+ @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();
+
+
+ }
+
/**
--
Gitblit v1.7.1