|
@@ -21,6 +21,9 @@ public class ConsigneeService {
|
|
|
@Resource
|
|
@Resource
|
|
|
private UserMapper userMapper;
|
|
private UserMapper userMapper;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private RealNameBackfillService realNameBackfillService;
|
|
|
|
|
+
|
|
|
public Result<List<Consignee>> list(Long userId) {
|
|
public Result<List<Consignee>> list(Long userId) {
|
|
|
List<Consignee> list = consigneeMapper.selectList(
|
|
List<Consignee> list = consigneeMapper.selectList(
|
|
|
new LambdaQueryWrapper<Consignee>()
|
|
new LambdaQueryWrapper<Consignee>()
|
|
@@ -59,6 +62,8 @@ public class ConsigneeService {
|
|
|
consigneeMapper.updateById(consignee);
|
|
consigneeMapper.updateById(consignee);
|
|
|
// 若联系人与当前用户姓名/手机号一致,同步地区信息到用户
|
|
// 若联系人与当前用户姓名/手机号一致,同步地区信息到用户
|
|
|
syncUserRegion(existing.getUserId(), consignee);
|
|
syncUserRegion(existing.getUserId(), consignee);
|
|
|
|
|
+ // 回填写在 syncUserRegion 之后:保持既有同步逻辑看到回填前的 realName,行为不变
|
|
|
|
|
+ realNameBackfillService.backfill(existing.getUserId(), consignee.getName());
|
|
|
return Result.success(consignee.getId());
|
|
return Result.success(consignee.getId());
|
|
|
} else {
|
|
} else {
|
|
|
// create
|
|
// create
|
|
@@ -71,6 +76,7 @@ public class ConsigneeService {
|
|
|
consigneeMapper.insert(consignee);
|
|
consigneeMapper.insert(consignee);
|
|
|
// 若联系人与当前用户姓名/手机号一致,同步地区信息到用户
|
|
// 若联系人与当前用户姓名/手机号一致,同步地区信息到用户
|
|
|
syncUserRegion(consignee.getUserId(), consignee);
|
|
syncUserRegion(consignee.getUserId(), consignee);
|
|
|
|
|
+ realNameBackfillService.backfill(consignee.getUserId(), consignee.getName());
|
|
|
return Result.success(consignee.getId());
|
|
return Result.success(consignee.getId());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|