From a3420936db4d9aebdc38118fb45561aa5762a6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sat, 13 Jun 2026 17:27:45 +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=A5=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserShipperApplicationService.java        | 50 ++++++++++++++++++-
 .../UserShipperMasterDataSyncService.java     |  5 ++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
index 2c24e056d..4c4d02309 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
@@ -1378,12 +1378,60 @@ public class UserShipperApplicationService {
         userShipperDO.setUpdateTime(DateUtil.date());
         UserShipperEntity userShipperEntity = userShipperDomainService.saveUserShipperByUserId(userShipperDO);
         userShipperDO.setShipperId(userShipperEntity.getShipperId());
-        authShipper(userShipperDO);
+        authEnterpriseShipperForMasterData(userShipperDO, loginUser);
 
         UserShipperEntity shipperEntity = userShipperDomainService.findShipperByUserId(user.getUserId());
         syncWlhyShipperSafely(shipperEntity, record.getCode());
     }
 
+    /**
+     * MDM 同步专用审核：只更新认证状态，不复制登录人全部角色、不开钱包、不发通知；网货由 syncWlhyShipperSafely 处理。
+     */
+    private void authEnterpriseShipperForMasterData(UserShipperDO userShipperDO, LoginUser loginUser) {
+        if (userShipperDO.getAuthType() == null || userShipperDO.getAuthType() != 2) {
+            throw new ServiceException("MDM同步仅支持企业委托方审核");
+        }
+        if (userShipperDO.getShipperAuthStatus() != 3) {
+            throw new ServiceException("MDM同步审核状态错误");
+        }
+        Long authUserId;
+        String authUserName;
+        if (ObjectUtil.isNotNull(userShipperDO.getAutomaticCheckUserInfo())
+                && ObjectUtil.equal(userShipperDO.getAutomaticCheckUserInfo(), 1)
+                && loginUser.getOrganizationPo() != null
+                && loginUser.getOrganizationPo().getPrincipalId() != null) {
+            authUserId = loginUser.getOrganizationPo().getPrincipalId();
+            authUserName = loginUser.getOrganizationPo().getPrincipalName();
+        } else {
+            authUserId = loginUser.getUserPo().getUserId();
+            authUserName = loginUser.getUserPo().getUserName();
+        }
+        String remark = "MDM主数据自动审核";
+        userShipperDO.setShipperFill(userShipperDO.getShipperAuthStatus());
+        userShipperDO.setShipperFillAuthId(authUserId);
+        userShipperDO.setShipperFillAuthName(authUserName);
+        userShipperDO.setShipperFillTime(DateUtil.date());
+        userShipperDO.setShipperFillRemark(remark);
+        userShipperDO.setShipperEnterpriseFill(userShipperDO.getShipperAuthStatus());
+        userShipperDO.setShipperType(2);
+        userShipperDO.setShipperEnterpriselAuthId(authUserId);
+        userShipperDO.setShipperEnterpriselAuthName(authUserName);
+        userShipperDO.setShipperEnterpriseFillTime(DateUtil.date());
+        userShipperDO.setShipperEnterpriseFillRemark(remark);
+
+        UserDO userDO = new UserDO();
+        userDO.setUserId(userShipperDO.getUserId());
+        userDO.setUserAuthStatus(userShipperDO.getShipperAuthStatus());
+        userDO.setUserAuthTime(userShipperDO.getShipperFillTime());
+        userDO.setUserAuthByUsername(authUserName);
+        userApplicationService.updateUser(userDO);
+
+        userShipperDO.setUpdateByName(loginUser.getUsername());
+        userShipperDO.setUpdateBy(loginUser.getUserid());
+        userShipperDO.setUpdateTime(new Date());
+        userShipperDomainService.saveUserShipper(userShipperDO);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void updateEnterpriseShipperFromMasterData(MdmMerchantRecordDTO record, UserShipperPo existing,
                                                     LoginUser loginUser, Long targetOrganizationId,
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 02754c6d2..b679eb16b 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
@@ -204,6 +204,11 @@ public class UserShipperMasterDataSyncService {
                     log.error(msg, e);
                 }
             }
+            log.info("MDM同步进度 page={}/{}, 本页{}条, 累计新增={}, 更新={}, 跳过={}, 失败={}",
+                    currentPage, pageData.getTotalPages() != null ? pageData.getTotalPages() : "?",
+                    pageData.getDataInfo().size(),
+                    resultVo.getAddCount(), resultVo.getUpdateCount(),
+                    resultVo.getSkipCount(), resultVo.getFailCount());
             totalPages = pageData.getTotalPages();
             if (totalPages == null || totalPages <= 0) {
                 break;