|
@@ -3,6 +3,7 @@ package com.sqx.modules.address.service.impl;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.sqx.common.exception.SqxException;
|
|
import com.sqx.common.exception.SqxException;
|
|
@@ -99,11 +100,16 @@ public class AddressServiceImpl extends ServiceImpl<AddressDao, Address> impleme
|
|
|
@Override
|
|
@Override
|
|
|
public Result selectAddressById(Long addressId) {
|
|
public Result selectAddressById(Long addressId) {
|
|
|
Address address = baseMapper.selectById(addressId);
|
|
Address address = baseMapper.selectById(addressId);
|
|
|
-
|
|
|
|
|
if(ObjectUtil.isNull(address)){
|
|
if(ObjectUtil.isNull(address)){
|
|
|
throw new SqxException("地址不存在");
|
|
throw new SqxException("地址不存在");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ Long insideAddressId = address.getInsideAddressId();
|
|
|
|
|
+ if (ObjectUtils.isNotEmpty(insideAddressId)) {
|
|
|
|
|
+ InsideAddress insideAddress = insideAddressService.getById(insideAddressId);
|
|
|
|
|
+ if (ObjectUtils.isNotEmpty(insideAddress)) {
|
|
|
|
|
+ address.setStationId(insideAddress.getStationId());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return Result.success().put("data", address);
|
|
return Result.success().put("data", address);
|
|
|
}
|
|
}
|
|
|
|
|
|