From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 ee196ff..e607e75 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
@@ -218,6 +218,9 @@
if (data==null){
return R.fail("当前优惠券不存在，请刷新后重试");
}
+ if(data.getDelFlag() == 1 || data.getShelfStatus() == 0){
+ 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("当前优惠券已全部领取完毕");
@@ -247,12 +250,11 @@
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(15);
- userPoint.setHistoricalPoint(lavePoint);
userPoint.setVariablePoint(point);
- userPoint.setBalance(byId.getLavePoint());
userPoint.setAppUserId(userid);
userPoint.setObjectId(Long.valueOf(data.getId()));
userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setChangeDirection(-1);
userPointService.save(userPoint);
}
}
@@ -300,9 +302,8 @@
@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);
+ String jsonStr = userCoupon.getCouponInfo();
+ CouponInfoVo couponInfoVo = JSON.parseObject(jsonStr, CouponInfoVo.class);
return R.ok(couponInfoVo);
}
--
Gitblit v1.7.1