From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 87ee464..d85db04 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,6 +1,7 @@
package com.ruoyi.job.task;
-import com.ruoyi.order.service.CommissionService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import lombok.extern.log4j.Log4j2;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -8,13 +9,13 @@
import javax.annotation.Resource;
import java.util.Set;
-@Component("ryTask")
+@Component("afterSalesTask")
@Log4j2
public class AfterSalesTask {
@Resource
private RedisTemplate<String, String> redisTemplate;
@Resource
- private CommissionService commissionService;
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
/**
* 计算佣金（设置每分钟执行一次）
@@ -25,7 +26,10 @@
// 从延迟队列中获取需要处理的订单
Set<String> orderIds = redisTemplate.opsForZSet().rangeByScore("delay_queue:commission", 0, now);
if (orderIds != null && !orderIds.isEmpty()) {
- commissionService.calculationCommission(orderIds);
+ R<Void> r = remoteOrderGoodsClient.calculationCommission(orderIds);
+ if (R.isError(r)) {
+ log.error("计算佣金失败，订单号：{}，错误信息：{}", orderIds, r.getMsg());
+ }
// 处理完后移除已处理的订单
redisTemplate.opsForZSet().removeRangeByScore("delay_queue:commission", 0, now);
}
--
Gitblit v1.7.1