|
|
@@ -1,6 +1,7 @@
|
|
|
package com.kym.service.miniapp.impl;
|
|
|
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
+import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
@@ -44,13 +45,12 @@ import static java.util.Map.of;
|
|
|
* @since 2023-06-27
|
|
|
*/
|
|
|
@Service
|
|
|
+@DS("db-miniapp")
|
|
|
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
|
|
|
private static final Logger LOGGER = LoggerFactory.getLogger(UserServiceImpl.class);
|
|
|
@Autowired
|
|
|
WxConfig wxConfig;
|
|
|
@Autowired
|
|
|
- private UserMapper userMapper;
|
|
|
- @Autowired
|
|
|
private AccountService accountService;
|
|
|
|
|
|
@Autowired
|
|
|
@@ -94,7 +94,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
newUser.setMobilePhone(mobilePhone);
|
|
|
newUser.setAvatar(params.getAvatar());
|
|
|
newUser.setNickname(params.getNickname());
|
|
|
- userMapper.insert(newUser);
|
|
|
+ baseMapper.insert(newUser);
|
|
|
// 创建用户账户
|
|
|
var account = new Account();
|
|
|
account.setUserId(newUser.getId());
|
|
|
@@ -118,7 +118,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
@Override
|
|
|
public UserVo getMe() {
|
|
|
var userId = StpUtil.getLoginIdAsLong();
|
|
|
- var userVo = userMapper.getMe(userId);
|
|
|
+ var userVo = baseMapper.getMe(userId);
|
|
|
var car = carsService.lambdaQuery().eq(Cars::getUserId, userId).eq(Cars::getIsDefault, 1).one();
|
|
|
if (car != null) {
|
|
|
userVo.setDefaultPlateNo(car.getPlateNo());
|
|
|
@@ -169,7 +169,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
userVo.setId(StpUtil.getSession().getLong("userId"));
|
|
|
var user = new User();
|
|
|
BeanUtils.copyProperties(userVo, user);
|
|
|
- userMapper.updateById(user);
|
|
|
+ baseMapper.updateById(user);
|
|
|
// 更新车牌信息
|
|
|
if (userVo.getDefaultPlateNo() != null) {
|
|
|
var car = new Cars();
|