From fa7b07817c00cbe2df78d55857501be9bf5256ed Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 21 Jan 2026 16:36:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=82=AE=E7=AE=B1=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/m2pool/lease/task/OrderAndPayTask.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java b/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
index 31b24cb..6eb985e 100644
--- a/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
+++ b/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
@@ -266,10 +266,6 @@ public class OrderAndPayTask {
                 }
                 //实际支付金额即使为0也要记录
                 recordMessageInfoList.add(build);
-                //实际支付不为0才记录
-                //if (build.getRealAmount().compareTo(BigDecimal.ZERO) > 0){
-                //    recordMessageInfoList.add(build);
-                //}
             });
 
             //修改订单支付金额等相关信息
@@ -284,7 +280,7 @@ public class OrderAndPayTask {
             handlerOrderPartComplete(itemCompleteIds,completeMachines);
         }
 
-        //3.处理完成的订单 + 发送mq消息去支付（订单全部完成）
+        //3.处理完成的订单 （订单全部完成）
         if (!orderComplete.isEmpty()){
             handlerOrderAllComplete(orderComplete);
         }
@@ -335,7 +331,7 @@ public class OrderAndPayTask {
             //    needPayInfos.add(orderTimeInfoDto);
             //}
             //开发环境
-            if ( minuteDate >= 30) {
+            if (minuteDate%30 == 0  && minuteDate > 1) {
                 needPayIds.add(orderTimeInfoDto.getId());
                 needPayInfos.add(orderTimeInfoDto);
             }
@@ -884,7 +880,7 @@ public class OrderAndPayTask {
         });
         leasePayRecordMessageService.saveBatch(reocrdList);
 
-        // 合并相同查询条件的记录，避免 SQL CASE WHEN 只执行第一条的问题
+        // 合并修改条件相同数据
         List<LeasePayRecordMessage> mergedRecordList = mergePayRecordMessages(reocrdList);
         //订单详情结算待结算金额
         leaseOrderItemMapper.updateSettleAmount(mergedRecordList);