From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java
index ab84d57..87ee464 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.job.task;
+import com.ruoyi.order.service.CommissionService;
import lombok.extern.log4j.Log4j2;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -12,9 +13,11 @@
public class AfterSalesTask {
@Resource
private RedisTemplate<String, String> redisTemplate;
+ @Resource
+ private CommissionService commissionService;
/**
- * 计算佣金
+ * 计算佣金（设置每分钟执行一次）
*/
public void afterSales()
{
@@ -22,15 +25,19 @@
// 从延迟队列中获取需要处理的订单
Set<String> orderIds = redisTemplate.opsForZSet().rangeByScore("delay_queue:commission", 0, now);
if (orderIds != null && !orderIds.isEmpty()) {
- for (String orderId : orderIds) {
- try {
- Long id = Long.parseLong(orderId);
- } catch (NumberFormatException e) {
- log.error("延迟队列中的订单ID无效: {}", orderId, e);
- }
- }
+ commissionService.calculationCommission(orderIds);
// 处理完后移除已处理的订单
redisTemplate.opsForZSet().removeRangeByScore("delay_queue:commission", 0, now);
}
}
+
+ /**
+ * 佣金补偿（每天执行一次）
+ * redis未配置持久化，为防止数据丢失，每天执行一次，将到期未处理的订单重新放入延迟队列中
+ */
+ public void afterSalesCompensation()
+ {
+ // 获取未处理的订单
+
+ }
}
--
Gitblit v1.7.1