weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
王奎兴
2026-06-17 11:39:39 +08:00
parent 37a70bc624 ebec834284
commit d1d02b7bc4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java
+4 -2
View File
@@ -149,6 +149,9 @@ public class UserShipperMasterDataSyncService {
break; break;
} }
for (MdmMerchantRecordDTO record : pageData.getDataInfo()) { for (MdmMerchantRecordDTO record : pageData.getDataInfo()) {
// 无论记录是否被跳过，都需要记录其 lastModifyRecordTime，确保增量水位不断向前推进
maxModifyTime = maxTime(maxModifyTime, record.getLastModifyRecordTime());
MdmMerchantSyncFilter.SkipReason skipReason = MdmMerchantSyncFilter.resolveSkipReason( MdmMerchantSyncFilter.SkipReason skipReason = MdmMerchantSyncFilter.resolveSkipReason(
record, orgNcCode, organizationId, topOrganizationId); record, orgNcCode, organizationId, topOrganizationId);
if (skipReason != null) { if (skipReason != null) {
@@ -196,7 +199,6 @@ public class UserShipperMasterDataSyncService {
saveTarget.getOrganizationName(), saveTarget.getTopOrganizationId()); saveTarget.getOrganizationName(), saveTarget.getTopOrganizationId());
resultVo.setUpdateCount(resultVo.getUpdateCount() + 1); resultVo.setUpdateCount(resultVo.getUpdateCount() + 1);
} }
maxModifyTime = maxTime(maxModifyTime, record.getLastModifyRecordTime());
} catch (Exception e) { } catch (Exception e) {
resultVo.setFailCount(resultVo.getFailCount() + 1); resultVo.setFailCount(resultVo.getFailCount() + 1);
String msg = "CODE=" + record.getCode() + " 同步失败：" + e.getMessage(); String msg = "CODE=" + record.getCode() + " 同步失败：" + e.getMessage();
@@ -229,7 +231,7 @@ public class UserShipperMasterDataSyncService {
MdmMerchantQueryDTO queryDTO = new MdmMerchantQueryDTO(); MdmMerchantQueryDTO queryDTO = new MdmMerchantQueryDTO();
queryDTO.setOrgNcCode(orgNcCode); queryDTO.setOrgNcCode(orgNcCode);
if (StringUtils.isNotEmpty(lastModifyRecordTime)) { if (StringUtils.isNotEmpty(lastModifyRecordTime)) {
queryDTO.setLastModifyRecordTime(lastModifyRecordTime + "~"); queryDTO.setLastModifyRecordTime(lastModifyRecordTime);
} }
queryDTO.setCurrentPage(currentPage); queryDTO.setCurrentPage(currentPage);
queryDTO.setCountPerPage(PAGE_SIZE); queryDTO.setCountPerPage(PAGE_SIZE);