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 { + @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 { + @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 { + @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 mergeShopUser() { + getMapper().truncateTable(); + curUserInfoMapper.truncateTable(); + Map oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); execUserInfo(); @@ -109,6 +116,7 @@ public class CurShopUserServiceImpl extends ServiceImpl oldShopUserList, Map oldAndCurShopIdMap) { List 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()));