BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 9148170926bc2f041597802390dba14d8f9ecaec

Authored by YunaiV
1 parent 891ed3d0

调整 mapper 命名，避免可能的冲突

Inline Side-by-side
Showing 10 changed files with 64 additions and 64 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/MemberAddressMapper.java
  View file @9148170
... ... @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
8 8 import java.util.List;
9 9  
10 10 @Mapper
11   -public interface AddressMapper extends BaseMapperX<MemberAddressDO> {
  11 +public interface MemberAddressMapper extends BaseMapperX<MemberAddressDO> {
12 12  
13 13 default MemberAddressDO selectByIdAndUserId(Long id, Long userId) {
14 14 return selectOne(MemberAddressDO::getId, id, MemberAddressDO::getUserId, userId);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
  View file @9148170
... ... @@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreate
5 5 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
6 6 import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
7 7 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
8   -import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
  8 +import cn.iocoder.yudao.module.member.dal.mysql.address.MemberAddressMapper;
9 9 import org.springframework.stereotype.Service;
10 10 import org.springframework.transaction.annotation.Transactional;
11 11 import org.springframework.validation.annotation.Validated;
... ... @@ -26,21 +26,21 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ADDRESS_NO
26 26 public class AddressServiceImpl implements AddressService {
27 27  
28 28 @Resource
29   - private AddressMapper addressMapper;
  29 + private MemberAddressMapper memberAddressMapper;
30 30  
31 31 @Override
32 32 @Transactional(rollbackFor = Exception.class)
33 33 public Long createAddress(Long userId, AppAddressCreateReqVO createReqVO) {
34 34 // 如果添加的是默认收件地址，则将原默认地址修改为非默认
35 35 if (Boolean.TRUE.equals(createReqVO.getDefaultStatus())) {
36   - List<MemberAddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
37   - addresses.forEach(address -> addressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false)));
  36 + List<MemberAddressDO> addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true);
  37 + addresses.forEach(address -> memberAddressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false)));
38 38 }
39 39  
40 40 // 插入
41 41 MemberAddressDO address = AddressConvert.INSTANCE.convert(createReqVO);
42 42 address.setUserId(userId);
43   - addressMapper.insert(address);
  43 + memberAddressMapper.insert(address);
44 44 // 返回
45 45 return address.getId();
46 46 }
... ... @@ -53,14 +53,14 @@ public class AddressServiceImpl implements AddressService {
53 53  
54 54 // 如果修改的是默认收件地址，则将原默认地址修改为非默认
55 55 if (Boolean.TRUE.equals(updateReqVO.getDefaultStatus())) {
56   - List<MemberAddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
  56 + List<MemberAddressDO> addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true);
57 57 addresses.stream().filter(u -> !u.getId().equals(updateReqVO.getId())) // 排除自己
58   - .forEach(address -> addressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false)));
  58 + .forEach(address -> memberAddressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false)));
59 59 }
60 60  
61 61 // 更新
62 62 MemberAddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO);
63   - addressMapper.updateById(updateObj);
  63 + memberAddressMapper.updateById(updateObj);
64 64 }
65 65  
66 66 @Override
... ... @@ -68,7 +68,7 @@ public class AddressServiceImpl implements AddressService {
68 68 // 校验存在,校验是否能够操作
69 69 validAddressExists(userId, id);
70 70 // 删除
71   - addressMapper.deleteById(id);
  71 + memberAddressMapper.deleteById(id);
72 72 }
73 73  
74 74 private void validAddressExists(Long userId, Long id) {
... ... @@ -80,17 +80,17 @@ public class AddressServiceImpl implements AddressService {
80 80  
81 81 @Override
82 82 public MemberAddressDO getAddress(Long userId, Long id) {
83   - return addressMapper.selectByIdAndUserId(id, userId);
  83 + return memberAddressMapper.selectByIdAndUserId(id, userId);
84 84 }
85 85  
86 86 @Override
87 87 public List<MemberAddressDO> getAddressList(Long userId) {
88   - return addressMapper.selectListByUserIdAndDefaulted(userId, null);
  88 + return memberAddressMapper.selectListByUserIdAndDefaulted(userId, null);
89 89 }
90 90  
91 91 @Override
92 92 public MemberAddressDO getDefaultUserAddress(Long userId) {
93   - List<MemberAddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
  93 + List<MemberAddressDO> addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true);
94 94 return CollUtil.getFirst(addresses);
95 95 }
96 96  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java
  View file @9148170
... ... @@ -31,7 +31,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_
31 31 public class MemberGroupServiceImpl implements MemberGroupService {
32 32  
33 33 @Resource
34   - private MemberGroupMapper groupMapper;
  34 + private MemberGroupMapper memberGroupMapper;
35 35 @Resource
36 36 private MemberUserService memberUserService;
37 37  
... ... @@ -39,7 +39,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
39 39 public Long createGroup(MemberGroupCreateReqVO createReqVO) {
40 40 // 插入
41 41 MemberGroupDO group = MemberGroupConvert.INSTANCE.convert(createReqVO);
42   - groupMapper.insert(group);
  42 + memberGroupMapper.insert(group);
43 43 // 返回
44 44 return group.getId();
45 45 }
... ... @@ -50,7 +50,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
50 50 validateGroupExists(updateReqVO.getId());
51 51 // 更新
52 52 MemberGroupDO updateObj = MemberGroupConvert.INSTANCE.convert(updateReqVO);
53   - groupMapper.updateById(updateObj);
  53 + memberGroupMapper.updateById(updateObj);
54 54 }
55 55  
56 56 @Override
... ... @@ -60,11 +60,11 @@ public class MemberGroupServiceImpl implements MemberGroupService {
60 60 // 校验分组下是否有用户
61 61 validateGroupHasUser(id);
62 62 // 删除
63   - groupMapper.deleteById(id);
  63 + memberGroupMapper.deleteById(id);
64 64 }
65 65  
66 66 void validateGroupExists(Long id) {
67   - if (groupMapper.selectById(id) == null) {
  67 + if (memberGroupMapper.selectById(id) == null) {
68 68 throw exception(GROUP_NOT_EXISTS);
69 69 }
70 70 }
... ... @@ -78,7 +78,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
78 78  
79 79 @Override
80 80 public MemberGroupDO getGroup(Long id) {
81   - return groupMapper.selectById(id);
  81 + return memberGroupMapper.selectById(id);
82 82 }
83 83  
84 84 @Override
... ... @@ -86,17 +86,17 @@ public class MemberGroupServiceImpl implements MemberGroupService {
86 86 if (CollUtil.isEmpty(ids)) {
87 87 return ListUtil.empty();
88 88 }
89   - return groupMapper.selectBatchIds(ids);
  89 + return memberGroupMapper.selectBatchIds(ids);
90 90 }
91 91  
92 92 @Override
93 93 public PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO) {
94   - return groupMapper.selectPage(pageReqVO);
  94 + return memberGroupMapper.selectPage(pageReqVO);
95 95 }
96 96  
97 97 @Override
98 98 public List<MemberGroupDO> getGroupListByStatus(Integer status) {
99   - return groupMapper.selectListByStatus(status);
  99 + return memberGroupMapper.selectListByStatus(status);
100 100 }
101 101  
102 102 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
  View file @9148170
... ... @@ -42,7 +42,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
42 42 public class MemberLevelServiceImpl implements MemberLevelService {
43 43  
44 44 @Resource
45   - private MemberLevelMapper levelMapper;
  45 + private MemberLevelMapper memberLevelMapper;
46 46 @Resource
47 47 private MemberLevelRecordService memberLevelRecordService;
48 48 @Resource
... ... @@ -57,7 +57,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
57 57  
58 58 // 插入
59 59 MemberLevelDO level = MemberLevelConvert.INSTANCE.convert(createReqVO);
60   - levelMapper.insert(level);
  60 + memberLevelMapper.insert(level);
61 61 // 返回
62 62 return level.getId();
63 63 }
... ... @@ -71,7 +71,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
71 71  
72 72 // 更新
73 73 MemberLevelDO updateObj = MemberLevelConvert.INSTANCE.convert(updateReqVO);
74   - levelMapper.updateById(updateObj);
  74 + memberLevelMapper.updateById(updateObj);
75 75 }
76 76  
77 77 @Override
... ... @@ -81,12 +81,12 @@ public class MemberLevelServiceImpl implements MemberLevelService {
81 81 // 校验分组下是否有用户
82 82 validateLevelHasUser(id);
83 83 // 删除
84   - levelMapper.deleteById(id);
  84 + memberLevelMapper.deleteById(id);
85 85 }
86 86  
87 87 @VisibleForTesting
88 88 MemberLevelDO validateLevelExists(Long id) {
89   - MemberLevelDO levelDO = levelMapper.selectById(id);
  89 + MemberLevelDO levelDO = memberLevelMapper.selectById(id);
90 90 if (levelDO == null) {
91 91 throw exception(LEVEL_NOT_EXISTS);
92 92 }
... ... @@ -141,7 +141,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
141 141  
142 142 @VisibleForTesting
143 143 void validateConfigValid(Long id, String name, Integer level, Integer experience) {
144   - List<MemberLevelDO> list = levelMapper.selectList();
  144 + List<MemberLevelDO> list = memberLevelMapper.selectList();
145 145 // 校验名称唯一
146 146 validateNameUnique(list, id, name);
147 147 // 校验等级唯一
... ... @@ -160,7 +160,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
160 160  
161 161 @Override
162 162 public MemberLevelDO getLevel(Long id) {
163   - return id != null && id > 0 ? levelMapper.selectById(id) : null;
  163 + return id != null && id > 0 ? memberLevelMapper.selectById(id) : null;
164 164 }
165 165  
166 166 @Override
... ... @@ -168,17 +168,17 @@ public class MemberLevelServiceImpl implements MemberLevelService {
168 168 if (CollUtil.isEmpty(ids)) {
169 169 return Collections.emptyList();
170 170 }
171   - return levelMapper.selectBatchIds(ids);
  171 + return memberLevelMapper.selectBatchIds(ids);
172 172 }
173 173  
174 174 @Override
175 175 public List<MemberLevelDO> getLevelList(MemberLevelListReqVO listReqVO) {
176   - return levelMapper.selectList(listReqVO);
  176 + return memberLevelMapper.selectList(listReqVO);
177 177 }
178 178  
179 179 @Override
180 180 public List<MemberLevelDO> getLevelListByStatus(Integer status) {
181   - return levelMapper.selectListByStatus(status);
  181 + return memberLevelMapper.selectListByStatus(status);
182 182 }
183 183  
184 184 @Override
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointConfigServiceImpl.java
  View file @9148170
... ... @@ -21,23 +21,23 @@ import java.util.List;
21 21 public class MemberPointConfigServiceImpl implements MemberPointConfigService {
22 22  
23 23 @Resource
24   - private MemberPointConfigMapper pointConfigMapper;
  24 + private MemberPointConfigMapper memberPointConfigMapper;
25 25  
26 26 @Override
27 27 public void savePointConfig(MemberPointConfigSaveReqVO saveReqVO) {
28 28 // 存在，则进行更新
29 29 MemberPointConfigDO dbConfig = getPointConfig();
30 30 if (dbConfig != null) {
31   - pointConfigMapper.updateById(MemberPointConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId()));
  31 + memberPointConfigMapper.updateById(MemberPointConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId()));
32 32 return;
33 33 }
34 34 // 不存在，则进行插入
35   - pointConfigMapper.insert(MemberPointConfigConvert.INSTANCE.convert(saveReqVO));
  35 + memberPointConfigMapper.insert(MemberPointConfigConvert.INSTANCE.convert(saveReqVO));
36 36 }
37 37  
38 38 @Override
39 39 public MemberPointConfigDO getPointConfig() {
40   - List<MemberPointConfigDO> list = pointConfigMapper.selectList();
  40 + List<MemberPointConfigDO> list = memberPointConfigMapper.selectList();
41 41 return CollectionUtils.getFirst(list);
42 42 }
43 43  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @9148170
... ... @@ -35,7 +35,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
35 35 public class MemberPointRecordServiceImpl implements MemberPointRecordService {
36 36  
37 37 @Resource
38   - private MemberPointRecordMapper recordMapper;
  38 + private MemberPointRecordMapper memberPointRecordMapper;
39 39 @Resource
40 40 private MemberPointConfigService memberPointConfigService;
41 41  
... ... @@ -55,12 +55,12 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
55 55 userIds = convertSet(users, MemberUserDO::getId);
56 56 }
57 57 // 执行查询
58   - return recordMapper.selectPage(pageReqVO, userIds);
  58 + return memberPointRecordMapper.selectPage(pageReqVO, userIds);
59 59 }
60 60  
61 61 @Override
62 62 public PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO) {
63   - return recordMapper.selectPage(userId, pageVO);
  63 + return memberPointRecordMapper.selectPage(userId, pageVO);
64 64 }
65 65  
66 66 @Override
... ... @@ -86,7 +86,7 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
86 86 .setUserId(userId).setBizId(bizId).setBizType(bizType.getType())
87 87 .setTitle(bizType.getName()).setDescription(StrUtil.format(bizType.getDescription(), point))
88 88 .setPoint(point).setTotalPoint(totalPoint);
89   - recordMapper.insert(record);
  89 + memberPointRecordMapper.insert(record);
90 90  
91 91 // 3. 更新用户积分
92 92 memberUserService.updateUserPoint(userId, totalPoint);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInConfigServiceImpl.java
  View file @9148170
... ... @@ -26,7 +26,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.SIGN_IN_CO
26 26 public class MemberSignInConfigServiceImpl implements MemberSignInConfigService {
27 27  
28 28 @Resource
29   - private MemberSignInConfigMapper signInConfigMapper;
  29 + private MemberSignInConfigMapper memberSignInConfigMapper;
30 30  
31 31 @Override
32 32 public Long createSignInConfig(MemberSignInConfigCreateReqVO createReqVO) {
... ... @@ -35,7 +35,7 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
35 35  
36 36 // 插入
37 37 MemberSignInConfigDO signInConfig = MemberSignInConfigConvert.INSTANCE.convert(createReqVO);
38   - signInConfigMapper.insert(signInConfig);
  38 + memberSignInConfigMapper.insert(signInConfig);
39 39 // 返回
40 40 return signInConfig.getId();
41 41 }
... ... @@ -49,7 +49,7 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
49 49  
50 50 // 判断更新
51 51 MemberSignInConfigDO updateObj = MemberSignInConfigConvert.INSTANCE.convert(updateReqVO);
52   - signInConfigMapper.updateById(updateObj);
  52 + memberSignInConfigMapper.updateById(updateObj);
53 53 }
54 54  
55 55 @Override
... ... @@ -57,11 +57,11 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
57 57 // 校验存在
58 58 validateSignInConfigExists(id);
59 59 // 删除
60   - signInConfigMapper.deleteById(id);
  60 + memberSignInConfigMapper.deleteById(id);
61 61 }
62 62  
63 63 private void validateSignInConfigExists(Long id) {
64   - if (signInConfigMapper.selectById(id) == null) {
  64 + if (memberSignInConfigMapper.selectById(id) == null) {
65 65 throw exception(SIGN_IN_CONFIG_NOT_EXISTS);
66 66 }
67 67 }
... ... @@ -73,7 +73,7 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
73 73 * @param id 编号，只有更新的时候会传递
74 74 */
75 75 private void validateSignInConfigDayDuplicate(Integer day, Long id) {
76   - MemberSignInConfigDO config = signInConfigMapper.selectByDay(day);
  76 + MemberSignInConfigDO config = memberSignInConfigMapper.selectByDay(day);
77 77 // 1. 新增时，config 非空，则说明重复
78 78 if (id == null && config != null) {
79 79 throw exception(SIGN_IN_CONFIG_EXISTS);
... ... @@ -86,19 +86,19 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
86 86  
87 87 @Override
88 88 public MemberSignInConfigDO getSignInConfig(Long id) {
89   - return signInConfigMapper.selectById(id);
  89 + return memberSignInConfigMapper.selectById(id);
90 90 }
91 91  
92 92 @Override
93 93 public List <MemberSignInConfigDO> getSignInConfigList() {
94   - List<MemberSignInConfigDO> list = signInConfigMapper.selectList();
  94 + List<MemberSignInConfigDO> list = memberSignInConfigMapper.selectList();
95 95 list.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
96 96 return list;
97 97 }
98 98  
99 99 @Override
100 100 public List<MemberSignInConfigDO> getSignInConfigList(Integer status) {
101   - List<MemberSignInConfigDO> list = signInConfigMapper.selectListByStatus(status);
  101 + List<MemberSignInConfigDO> list = memberSignInConfigMapper.selectListByStatus(status);
102 102 list.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
103 103 return list;
104 104 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @9148170
... ... @@ -28,7 +28,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
28 28 public class MemberSignInRecordServiceImpl implements MemberSignInRecordService {
29 29  
30 30 @Resource
31   - private MemberSignInRecordMapper signInRecordMapper;
  31 + private MemberSignInRecordMapper memberSignInRecordMapper;
32 32  
33 33 @Resource
34 34 private MemberUserApi memberUserApi;
... ... @@ -46,12 +46,12 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
46 46 userIds = convertSet(users, MemberUserRespDTO::getId);
47 47 }
48 48 // 分页查询
49   - return signInRecordMapper.selectPage(pageReqVO, userIds);
  49 + return memberSignInRecordMapper.selectPage(pageReqVO, userIds);
50 50 }
51 51  
52 52 @Override
53 53 public PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam) {
54   - return signInRecordMapper.selectPage(userId, pageParam);
  54 + return memberSignInRecordMapper.selectPage(userId, pageParam);
55 55 }
56 56  
57 57 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
  View file @9148170
... ... @@ -31,7 +31,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
31 31 public class MemberTagServiceImpl implements MemberTagService {
32 32  
33 33 @Resource
34   - private MemberTagMapper tagMapper;
  34 + private MemberTagMapper memberTagMapper;
35 35 @Resource
36 36 private MemberUserService memberUserService;
37 37  
... ... @@ -41,7 +41,7 @@ public class MemberTagServiceImpl implements MemberTagService {
41 41 validateTagNameUnique(null, createReqVO.getName());
42 42 // 插入
43 43 MemberTagDO tag = MemberTagConvert.INSTANCE.convert(createReqVO);
44   - tagMapper.insert(tag);
  44 + memberTagMapper.insert(tag);
45 45 // 返回
46 46 return tag.getId();
47 47 }
... ... @@ -54,7 +54,7 @@ public class MemberTagServiceImpl implements MemberTagService {
54 54 validateTagNameUnique(updateReqVO.getId(), updateReqVO.getName());
55 55 // 更新
56 56 MemberTagDO updateObj = MemberTagConvert.INSTANCE.convert(updateReqVO);
57   - tagMapper.updateById(updateObj);
  57 + memberTagMapper.updateById(updateObj);
58 58 }
59 59  
60 60 @Override
... ... @@ -64,11 +64,11 @@ public class MemberTagServiceImpl implements MemberTagService {
64 64 // 校验标签下是否有用户
65 65 validateTagHasUser(id);
66 66 // 删除
67   - tagMapper.deleteById(id);
  67 + memberTagMapper.deleteById(id);
68 68 }
69 69  
70 70 private void validateTagExists(Long id) {
71   - if (tagMapper.selectById(id) == null) {
  71 + if (memberTagMapper.selectById(id) == null) {
72 72 throw exception(TAG_NOT_EXISTS);
73 73 }
74 74 }
... ... @@ -77,7 +77,7 @@ public class MemberTagServiceImpl implements MemberTagService {
77 77 if (StrUtil.isBlank(name)) {
78 78 return;
79 79 }
80   - MemberTagDO tag = tagMapper.selelctByName(name);
  80 + MemberTagDO tag = memberTagMapper.selelctByName(name);
81 81 if (tag == null) {
82 82 return;
83 83 }
... ... @@ -100,7 +100,7 @@ public class MemberTagServiceImpl implements MemberTagService {
100 100  
101 101 @Override
102 102 public MemberTagDO getTag(Long id) {
103   - return tagMapper.selectById(id);
  103 + return memberTagMapper.selectById(id);
104 104 }
105 105  
106 106 @Override
... ... @@ -108,17 +108,17 @@ public class MemberTagServiceImpl implements MemberTagService {
108 108 if (CollUtil.isEmpty(ids)) {
109 109 return ListUtil.empty();
110 110 }
111   - return tagMapper.selectBatchIds(ids);
  111 + return memberTagMapper.selectBatchIds(ids);
112 112 }
113 113  
114 114 @Override
115 115 public PageResult<MemberTagDO> getTagPage(MemberTagPageReqVO pageReqVO) {
116   - return tagMapper.selectPage(pageReqVO);
  116 + return memberTagMapper.selectPage(pageReqVO);
117 117 }
118 118  
119 119 @Override
120 120 public List<MemberTagDO> getTagList() {
121   - return tagMapper.selectList();
  121 + return memberTagMapper.selectList();
122 122 }
123 123  
124 124 }
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
  View file @9148170
... ... @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
4 4 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
5 5 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
6 6 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
7   -import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
  7 +import cn.iocoder.yudao.module.member.dal.mysql.address.MemberAddressMapper;
8 8 import org.junit.jupiter.api.Test;
9 9 import org.springframework.context.annotation.Import;
10 10  
... ... @@ -30,7 +30,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
30 30 private AddressServiceImpl addressService;
31 31  
32 32 @Resource
33   - private AddressMapper addressMapper;
  33 + private MemberAddressMapper addressMapper;
34 34  
35 35 @Test
36 36 public void testCreateAddress_success() {
... ...