From 36c80bd718937ef52daee697c19ab09144dafa6c Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Wed, 12 Nov 2025 09:42:28 +0800
Subject: [PATCH] =?UTF-8?q?TODO=20=E5=88=86=E9=94=80=20=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/task/DistributionTask.java   | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java
index 3ed00743a..9cfe1e6a1 100644
--- a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java
@@ -2,28 +2,21 @@ package com.czg.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
-import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
-import com.czg.market.entity.MkDistributionDeliver;
 import com.czg.market.entity.MkDistributionFlow;
-import com.czg.market.service.MkBirthdayGiftService;
-import com.czg.market.service.MkDistributionDeliverService;
 import com.czg.market.service.MkDistributionFlowService;
 import com.czg.market.service.MkDistributionUserService;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderInfoService;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.utils.FunUtils;
-import com.itextpdf.styledxmlparser.jsoup.helper.DataUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -33,13 +26,10 @@ import java.time.LocalDateTime;
  * 分销定时任务
  *
  * @author ww
- * @description
  */
 @Slf4j
 @Component
 public class DistributionTask {
-    @Resource
-    private MkDistributionDeliverService distributionDeliverService;
     @Resource
     private MkDistributionUserService distributionUserService;
     @Resource
@@ -53,12 +43,19 @@ public class DistributionTask {
     private ShopUserService shopUserService;
 
     /**
-     * 生日有礼奖励发放
+     * 分销流水入账
      * AAMarketTasks 统一调用位置
      */
 //    @Scheduled(cron = "0 0 0 * * ?")
-    @Scheduled(fixedRate = 30000)
+//    @Scheduled(fixedRate = 30000)
     public void deliver() {
+        // TODO 逻辑修改
+        //  1. 订单完成支付时（判断是否分销）产生流水记录。
+        //  2. 判断入账时间。
+        //  3. 如果是 0 天，再去判断商户余额是否足够。够则入账，不足则不管。
+        //  4. 流水增加应该入账的时间（订单产生时带入）
+        //  5. 定时任务 应该是一天执行一次。查询待入账状态和应入账时间小于当前时间的记录，循环处理：并且判断商户余额是否足够，余额不足忽略处理；余额足够变为已入账并扣除商户余额。
+        //  6. 订单产生退款时，去流水表查询该订单的流水记录，如果未入账改为已入账，并插入一条退款扣钱的流水。
         LocalDateTime localDateTime = DateUtil.date().toLocalDateTime();
         distributionFlowService.list(new QueryWrapper()
                 .eq(MkDistributionFlow::getStatus, TableValueConstant.DistributionFlow.Status.PENDING.getCode())).forEach(item -> {