From 6b12805b53f7a6d131b5cffcf45e3b3c68336568 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 10:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 f6915f7..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,6 +13,8 @@
public class AfterSalesTask {
@Resource
private RedisTemplate<String, String> redisTemplate;
+ @Resource
+ private CommissionService commissionService;
/**
* 计算佣金（设置每分钟执行一次）
@@ -22,6 +25,7 @@
// 从延迟队列中获取需要处理的订单
Set<String> orderIds = redisTemplate.opsForZSet().rangeByScore("delay_queue:commission", 0, now);
if (orderIds != null && !orderIds.isEmpty()) {
+ commissionService.calculationCommission(orderIds);
// 处理完后移除已处理的订单
redisTemplate.opsForZSet().removeRangeByScore("delay_queue:commission", 0, now);
}
--
Gitblit v1.7.1