From 2982a0a179e5a634a3fbf6dce37c6021f4b753b8 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Tue, 18 Feb 2025 15:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E7=94=A8=E6=88=B7=20=20?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8E=9F=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/mergedata/cur/mapper/CurShopUserMapper.java   | 3 +++
 .../com/czg/mergedata/cur/mapper/CurSysUserMapper.java    | 3 +++
 .../com/czg/mergedata/cur/mapper/CurUserInfoMapper.java   | 3 +++
 .../cur/service/impl/CurShopUserServiceImpl.java          | 8 ++++++++
 4 files changed, 17 insertions(+)

diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopUserMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopUserMapper.java
index 9815faf..b04b4da 100644
--- a/src/main/java/com/czg/mergedata/cur/mapper/CurShopUserMapper.java
+++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopUserMapper.java
@@ -3,6 +3,7 @@ package com.czg.mergedata.cur.mapper;
 import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
 import com.czg.mergedata.cur.entity.CurShopUser;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 商户储值会员 映射层。
@@ -13,4 +14,6 @@ import com.czg.mergedata.cur.entity.CurShopUser;
 @UseDataSource("ds1")
 public interface CurShopUserMapper extends BaseMapper<CurShopUser> {
 
+    @Select("truncate tb_shop_user ")
+    void truncateTable();
 }
diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java
index 19f763a..51c40c6 100644
--- a/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java
+++ b/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java
@@ -3,6 +3,7 @@ package com.czg.mergedata.cur.mapper;
 import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
 import com.czg.mergedata.cur.entity.CurSysUser;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 系统用户 映射层。
@@ -13,4 +14,6 @@ import com.czg.mergedata.cur.entity.CurSysUser;
 @UseDataSource("ds1")
 public interface CurSysUserMapper extends BaseMapper<CurSysUser> {
 
+    @Select("truncate sys_user ")
+    void truncateTable();
 }
diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurUserInfoMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurUserInfoMapper.java
index edf3823..e42ab71 100644
--- a/src/main/java/com/czg/mergedata/cur/mapper/CurUserInfoMapper.java
+++ b/src/main/java/com/czg/mergedata/cur/mapper/CurUserInfoMapper.java
@@ -3,6 +3,7 @@ package com.czg.mergedata.cur.mapper;
 import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
 import com.czg.mergedata.cur.entity.CurUserInfo;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 用户端 用户信息表 映射层。
@@ -13,4 +14,6 @@ import com.czg.mergedata.cur.entity.CurUserInfo;
 @UseDataSource("ds1")
 public interface CurUserInfoMapper extends BaseMapper<CurUserInfo> {
 
+    @Select("truncate tb_user_info ")
+    void truncateTable();
 }
diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java
index ee04aa2..f6aa455 100644
--- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java
+++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java
@@ -6,6 +6,7 @@ import com.czg.mergedata.common.utils.PageUtils;
 import com.czg.mergedata.cur.entity.CurShopUser;
 import com.czg.mergedata.cur.entity.CurUserInfo;
 import com.czg.mergedata.cur.mapper.CurShopUserMapper;
+import com.czg.mergedata.cur.mapper.CurUserInfoMapper;
 import com.czg.mergedata.cur.service.CurShopIdRelationService;
 import com.czg.mergedata.cur.service.CurShopUserService;
 import com.czg.mergedata.cur.service.CurUserInfoService;
@@ -36,6 +37,9 @@ public class CurShopUserServiceImpl extends ServiceImpl<CurShopUserMapper, CurSh
     @Resource
     private CurShopIdRelationService curShopIdRelationService;
 
+    @Resource
+    private CurUserInfoMapper curUserInfoMapper;
+
     @Resource
     private OldUserInfoService oldUserInfoService;
 
@@ -48,6 +52,9 @@ public class CurShopUserServiceImpl extends ServiceImpl<CurShopUserMapper, CurSh
     @Override
     @Transactional
     public CzgResult<String> mergeShopUser() {
+        getMapper().truncateTable();
+        curUserInfoMapper.truncateTable();
+
         Map<Long, Long> oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation();
 
         execUserInfo();
@@ -109,6 +116,7 @@ public class CurShopUserServiceImpl extends ServiceImpl<CurShopUserMapper, CurSh
     private void saveCurShopUser(List<OldShopUser> oldShopUserList, Map<Long, Long> oldAndCurShopIdMap) {
         List<CurShopUser> curShopUserList = oldShopUserList.stream().map(oldShopUser -> {
             CurShopUser curShopUser = new CurShopUser();
+            curShopUser.setId(Long.valueOf(oldShopUser.getId()));
             Long shopId = oldAndCurShopIdMap.get(Long.valueOf(oldShopUser.getId()));
             curShopUser.setShopId(shopId == null ? 1L : shopId);
             curShopUser.setUserId(Long.valueOf(oldShopUser.getId()));