From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 06 三月 2025 09:20:40 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index e0d7b19..bd0bbc2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -543,6 +543,7 @@
balanceChangeRecord.setCreateTime(LocalDateTime.now());
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
+
//退回获得的消费积分
//需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
Integer lavePoint = appUser.getLavePoint();
@@ -660,6 +661,10 @@
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
+
+ shopPointClient.deleteShopPointCopy(order.getId(), Arrays.asList(1,2,3));
+ appUserGiveawayTemporaryClient.delAppUserGiveawayTemporary(order.getId());
+ shopGiveawayTemporaryClient.delShopGiveawayTemporary(order.getId());
return R.ok();
}
@@ -933,6 +938,10 @@
if (order_express.size() > 0) {
for (Long id : order_express) {
Order order = this.getById(id);
+ if (order == null){
+ redisTemplate.opsForZSet().remove("order_express", id);
+ continue;
+ }
if (order.getOrderStatus() != 2) {
redisTemplate.opsForZSet().remove("order_express", id);
continue;
--
Gitblit v1.7.1