From 95e074d97d6bfc8a6515a45d0f1b2854c00b6cdf Mon Sep 17 00:00:00 2001
From: wangxiaopeng <807933401@qq.com>
Date: Thu, 9 May 2024 09:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=BD=95=E5=85=A5=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E6=B2=A1=E6=9C=89=E5=BA=97=E9=93=BAid=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cool/store/dao/TempUserDetailDAO.java |  4 ++++
 .../XfsgTrainingPersonSyncListener.java       | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java
index c72270b26..9d813dd6c 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java
@@ -29,6 +29,10 @@ public class TempUserDetailDAO {
         return tempUserDetailMapper.insertSelective(detailDO);
     }
 
+    public Integer updateByPrimaryKeySelective(TempUserDetailDO detailDO) {
+        return tempUserDetailMapper.updateByPrimaryKeySelective(detailDO);
+    }
+
     public TempUserDetailDO selectById(Long id) {
         return tempUserDetailMapper.selectOne(TempUserDetailDO.builder().id(id).build());
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
index 235172100..53e9a1c89 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
@@ -84,16 +84,24 @@ public class XfsgTrainingPersonSyncListener implements MessageListener {
         }
         TempUserDetailDO checkTempUserDetailDO = tempUserDetailDAO.selectByIdCard(request.getIdCard());
         // 系统已建店,并且身份证号信息不存在
-        if(checkTempUserDetailDO != null){
+        if(checkTempUserDetailDO == null){
+            StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber());
+            log.info("培训人员主数据信息：staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO));
+            if(staffBaseInfoDTO != null){
+                TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO);
+                tempUserDetailDAO.insertSelective(tempUserDetailDO);
+            }
+        }else if(checkTempUserDetailDO != null && checkTempUserDetailDO.getShopId() == 0L){
+            // 已录入，但是没有店铺id
+            checkTempUserDetailDO.setLineId(shopInfoDO.getLineId());
+            checkTempUserDetailDO.setShopId(shopInfoDO.getId());
+            checkTempUserDetailDO.setRegionId(shopInfoDO.getRegionId());
+            tempUserDetailDAO.updateByPrimaryKeySelective(checkTempUserDetailDO);
+        }else {
             log.info("培训人员身份证信息已存在idCard:{}", checkTempUserDetailDO.getIdCard());
             return;
         }
-        StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber());
-        log.info("培训人员主数据信息：staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO));
-        if(staffBaseInfoDTO != null){
-            TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO);
-            tempUserDetailDAO.insertSelective(tempUserDetailDO);
-        }
+
     }
 
     private TempUserDetailDO fillTempUserDetailDO(ShopInfoDO shopInfoDO, StaffBaseInfoDTO staffBaseInfoDTO) {