修改登录时没有查询技师id
This commit is contained in:
parent
9cc1567908
commit
b9adb88246
|
@ -1120,6 +1120,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
userEntity.setUpdateTime(sdf.format(new Date()));
|
userEntity.setUpdateTime(sdf.format(new Date()));
|
||||||
baseMapper.updateById(userEntity);
|
baseMapper.updateById(userEntity);
|
||||||
|
|
||||||
|
|
||||||
|
Artificer artificer = artificerService.selectArtificerByUserId(userEntity.getUserId());
|
||||||
|
if(artificer!=null){
|
||||||
|
userEntity.setArtificerId(artificer.getArtificerId());
|
||||||
|
}
|
||||||
|
|
||||||
return getResult(userEntity);
|
return getResult(userEntity);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -344,6 +344,9 @@ public class AppArtificerController {
|
||||||
@GetMapping(value = "selectArtificerMassage")
|
@GetMapping(value = "selectArtificerMassage")
|
||||||
public Result selectArtificerMassage(@RequestAttribute Long userId, Integer page, Integer limit, Integer status){
|
public Result selectArtificerMassage(@RequestAttribute Long userId, Integer page, Integer limit, Integer status){
|
||||||
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
||||||
|
if(artificer == null){
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
return artificerMassageService.selectArtificerMassage(artificer.getArtificerId(), page, limit, status);
|
return artificerMassageService.selectArtificerMassage(artificer.getArtificerId(), page, limit, status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -352,6 +355,9 @@ public class AppArtificerController {
|
||||||
@GetMapping(value = "selectArtificerIndex")
|
@GetMapping(value = "selectArtificerIndex")
|
||||||
public Result selectArtificerIndex(@RequestAttribute Long userId,String startTime,String endTime){
|
public Result selectArtificerIndex(@RequestAttribute Long userId,String startTime,String endTime){
|
||||||
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
||||||
|
if(artificer == null){
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
return ordersService.selectArtificerIndex(artificer.getArtificerId(),startTime,endTime);
|
return ordersService.selectArtificerIndex(artificer.getArtificerId(),startTime,endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -382,6 +388,9 @@ public class AppArtificerController {
|
||||||
@ApiOperation("技师收益")
|
@ApiOperation("技师收益")
|
||||||
public Result selectArtificerMoney(@RequestAttribute Long userId){
|
public Result selectArtificerMoney(@RequestAttribute Long userId){
|
||||||
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
||||||
|
if(artificer == null){
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
return artificerService.selectArtificerMoney(userId,artificer.getArtificerId());
|
return artificerService.selectArtificerMoney(userId,artificer.getArtificerId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue