From c5d750c054ba7c06757f024d51a379f5bef0b6d0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 07 Dec 2023 14:41:13 +0800
Subject: [PATCH] 用户留言

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index a0103a0..11c321e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -851,7 +851,7 @@
                 //偏移时间
                 DateTime dateTime = DateUtil.offsetDay(payTime, cycle);
                 int compare = DateUtil.compare(now, dateTime);
-                if(compare <= 0){
+                if(compare >= 0){
                     /**
                      * 更新买单状态
                      * 收益生成一条卖单
@@ -934,7 +934,8 @@
          * 当前时间比结束时间大
          */
         if(nowTime.compareTo(endTime) >= 0){
-            List<MallProductSellRecord> mallProductSellRecords = mallProductSellRecordMapper.selectListByState(ProductEnum.PRODUCT_MATE_STATE_PAY.getValue());
+            List<MallProductSellRecord> mallProductSellRecords = mallProductSellRecordMapper.selectListByState(
+                    ProductEnum.PRODUCT_MATE_STATE_PAY.getValue());
             if(CollUtil.isNotEmpty(mallProductSellRecords)){
                 for(MallProductSellRecord mallProductSellRecord : mallProductSellRecords){
                     /**
@@ -986,6 +987,13 @@
                      * 预约记录超时
                      */
                     String orderNo = mallProductBuy.getOrderNo();
+                    /**
+                     * 只要存在匹配记录,则不退回。
+                     */
+                    List<MallProductBuyRecord> mallProductBuyRecords = mallProductBuyRecordMapper.selectRecordListByBuyId(mallProductBuy.getId());
+                    if(CollUtil.isNotEmpty(mallProductBuyRecords)){
+                        continue;
+                    }
                     mallProductBuy.setState(ProductEnum.PRODUCT_BUY_TIMEOUT.getValue());
                     mallProductBuyMapper.updateById(mallProductBuy);
 

--
Gitblit v1.9.1