From ebec834284afcdef15cb02b20d51b1c9b1ec8273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Wed, 17 Jun 2026 11:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E5=95=86=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5LASTMODIFYRECORDTIME=E5=A2=9E=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/UserShipperMasterDataSyncService.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java
index b679eb16b..cd79a3a0a 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java
@@ -149,6 +149,9 @@ public class UserShipperMasterDataSyncService {
                 break;
             }
             for (MdmMerchantRecordDTO record : pageData.getDataInfo()) {
+                // 无论记录是否被跳过，都需要记录其 lastModifyRecordTime，确保增量水位不断向前推进
+                maxModifyTime = maxTime(maxModifyTime, record.getLastModifyRecordTime());
+
                 MdmMerchantSyncFilter.SkipReason skipReason = MdmMerchantSyncFilter.resolveSkipReason(
                         record, orgNcCode, organizationId, topOrganizationId);
                 if (skipReason != null) {
@@ -196,7 +199,6 @@ public class UserShipperMasterDataSyncService {
                                 saveTarget.getOrganizationName(), saveTarget.getTopOrganizationId());
                         resultVo.setUpdateCount(resultVo.getUpdateCount() + 1);
                     }
-                    maxModifyTime = maxTime(maxModifyTime, record.getLastModifyRecordTime());
                 } catch (Exception e) {
                     resultVo.setFailCount(resultVo.getFailCount() + 1);
                     String msg = "CODE=" + record.getCode() + " 同步失败：" + e.getMessage();
@@ -229,7 +231,7 @@ public class UserShipperMasterDataSyncService {
         MdmMerchantQueryDTO queryDTO = new MdmMerchantQueryDTO();
         queryDTO.setOrgNcCode(orgNcCode);
         if (StringUtils.isNotEmpty(lastModifyRecordTime)) {
-            queryDTO.setLastModifyRecordTime(lastModifyRecordTime + "~");
+            queryDTO.setLastModifyRecordTime(lastModifyRecordTime);
         }
         queryDTO.setCurrentPage(currentPage);
         queryDTO.setCountPerPage(PAGE_SIZE);