From 21d2e2cb2d146b853e2072a56c8309b3201e2bcb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 13:38:44 +0800
Subject: [PATCH] 修改启动异常
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 003c5b0..b7d431b 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,5 +1,4 @@
package com.ruoyi.account.controller;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,29 +6,23 @@
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.api.vo.PaymentUserCouponVo;
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;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
import org.springframework.web.bind.annotation.*;
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;
/**
@@ -98,7 +91,7 @@
if (data==null){
return R.fail("当前优惠券不存在，请刷新后重试");
}
- if (data.getSendType()!=1&&byId.getLavePoint().compareTo(data.getNeedPoint())==-1){
+ if (data.getSendType()!=1&&byId.getLavePoint().compareTo(data.getNeedPoint().intValue())==-1){
return R.fail("当前积分不足，兑换失败");
}
//检验发放时间
@@ -111,12 +104,12 @@
UserPoint userPoint = new UserPoint();
userPoint.setType(4);
userPoint.setHistoricalPoint(byId.getLavePoint());
- userPoint.setVariablePoint(data.getNeedPoint());
+ userPoint.setVariablePoint(data.getNeedPoint().intValue());
userPoint.setAppUserId(userid);
userPoint.setObjectId(Long.valueOf(data.getId()));
userPointService.save(userPoint);
//扣除积分
- byId.setLavePoint(byId.getLavePoint().subtract(userPoint.getVariablePoint()));
+ byId.setLavePoint(byId.getLavePoint() - userPoint.getVariablePoint());
appUserService.updateById(byId);
}
//增加优惠券记录,根据时间类型设置开始结束时间
@@ -145,10 +138,25 @@
*/
@ResponseBody
@PostMapping("/getPaymentUserCoupon")
- public R<List<CouponInfoVo>> getPaymentUserCoupon(@RequestBody PaymentUserCoupon paymentUserCoupon){
- List<CouponInfoVo> userCoupon = userCouponService.getUserCoupon(paymentUserCoupon.getUserId(), paymentUserCoupon.getOrderMoney(), paymentUserCoupon.getType());
+ public R<List<PaymentUserCouponVo>> getPaymentUserCoupon(@RequestBody PaymentUserCoupon paymentUserCoupon){
+ List<PaymentUserCouponVo> userCoupon = userCouponService.getUserCoupon(paymentUserCoupon.getUserId(), paymentUserCoupon.getType());
return R.ok(userCoupon);
}
-
+
+
+ /**
+ * 根据用户优惠券id获取优惠券详情
+ * @param userCouponId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getCouponInfo")
+ public R<CouponInfoVo> getCouponInfo(@RequestParam("userCouponId") Long userCouponId){
+ UserCoupon userCoupon = userCouponService.getById(userCouponId);
+ CouponInfo data = couponClient.detail(userCoupon.getCouponId()).getData();
+ CouponInfoVo couponInfoVo = new CouponInfoVo();
+ BeanUtils.copyProperties(data, couponInfoVo);
+ return R.ok(couponInfoVo);
+ }
}
--
Gitblit v1.7.1