From 8495247c638d9b201eedfaf09bbf38e0fecda87d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 09:53:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/point/PointGoodsService.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/point/PointGoodsService.java b/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
index da76c43..9e408ea 100644
--- a/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
+++ b/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
@@ -170,8 +170,26 @@
if(!Constants.POINT_GOODS_RECORD_STATUS.A.name().equals(record.getStatus())){
throw new ValidationException("兑换券已使用或过期");
}
+ if(!SecurityUtils.getUserId().equals(record.getUserId())){
+ throw new ValidationException("兑换券不属于当前用户");
+ }
record.setStatus(Constants.POINT_GOODS_RECORD_STATUS.U.name());
record.setOrderId(orderId);
pointGoodsRecordMapper.updateById(record);
}
+ public void revertExchangeGoods(Long recordId) {
+ PointGoodsRecord record = pointGoodsRecordMapper.selectById(recordId);
+ if(record == null){
+ throw new ValidationException("兑换券不存在");
+ }
+ if(!Constants.POINT_GOODS_RECORD_STATUS.U.name().equals(record.getStatus())){
+ throw new ValidationException("兑换券未使用或过期");
+ }
+ if(!SecurityUtils.getUserId().equals(record.getUserId())){
+ throw new ValidationException("兑换券不属于当前用户");
+ }
+ record.setStatus(Constants.POINT_GOODS_RECORD_STATUS.A.name());
+ record.setOrderId(null);
+ pointGoodsRecordMapper.updateById(record);
+ }
}
--
Gitblit v1.9.3