From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 18:32:03 +0800
Subject: [PATCH] 1

---
 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/AfterSalesTask.java |   27 +++++++++++++++++++--------
 1 files changed, 19 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..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,5 +1,7 @@
 package com.ruoyi.job.task;
 
+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;
@@ -7,14 +9,16 @@
 import javax.annotation.Resource;
 import java.util.Set;
 
-@Component("ryTask")
+@Component("afterSalesTask")
 @Log4j2
 public class AfterSalesTask {
     @Resource
     private RedisTemplate<String, String> redisTemplate;
+    @Resource
+    private RemoteOrderGoodsClient remoteOrderGoodsClient;
 
     /**
-     * 计算佣金
+     * 计算佣金(设置每分钟执行一次)
      */
     public void afterSales()
     {
@@ -22,15 +26,22 @@
         // 从延迟队列中获取需要处理的订单
         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);
-                }
+            R<Void> r = remoteOrderGoodsClient.calculationCommission(orderIds);
+            if (R.isError(r)) {
+                log.error("计算佣金失败,订单号:{},错误信息:{}", orderIds, r.getMsg());
             }
             // 处理完后移除已处理的订单
             redisTemplate.opsForZSet().removeRangeByScore("delay_queue:commission", 0, now);
         }
     }
+
+    /**
+     * 佣金补偿(每天执行一次)
+     * redis未配置持久化,为防止数据丢失,每天执行一次,将到期未处理的订单重新放入延迟队列中
+     */
+    public void afterSalesCompensation()
+    {
+        // 获取未处理的订单
+
+    }
 }

--
Gitblit v1.7.1