From 316a91aee6236f312d53eca6cebbaa00c2803d92 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 15:26:55 +0800
Subject: [PATCH] feat(address): 添加国家名称字段支持
---
src/main/java/cc/mrbird/febs/mall/entity/MallAddressInfo.java | 1 +
src/main/java/cc/mrbird/febs/mall/vo/AddressInfoVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 1 +
src/main/java/cc/mrbird/febs/mall/dto/AddressInfoDto.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java | 2 ++
5 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddressInfoDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddressInfoDto.java
index 4d269ab..f126756 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddressInfoDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddressInfoDto.java
@@ -48,6 +48,8 @@
@NotBlank(message = "Country/Region required")
@ApiModelProperty(value = "Country/Region")
private String country;
+ @ApiModelProperty(value = "Country/Region")
+ private String countryName;
/**
* 经度
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallAddressInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallAddressInfo.java
index 6673d1e..716e577 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallAddressInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallAddressInfo.java
@@ -52,5 +52,6 @@
//市
private String city;
private String country;
+ private String countryName;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java
index b62fb99..fda47b1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java
@@ -70,6 +70,7 @@
addressInfoVo.setCity(mallAddressInfo.getCity());
addressInfoVo.setProvince(mallAddressInfo.getProvince());
addressInfoVo.setCountry(mallAddressInfo.getCountry());
+ addressInfoVo.setCountryName(mallAddressInfo.getCountryName());
}
return new FebsResponse().success().data(addressInfoVo);
}
@@ -92,6 +93,7 @@
.set(MallAddressInfo::getCity, addressInfoDto.getCity())
.set(MallAddressInfo::getProvince, addressInfoDto.getProvince())
.set(MallAddressInfo::getCountry, addressInfoDto.getCountry())
+ .set(MallAddressInfo::getCountryName, addressInfoDto.getCountryName())
.eq(MallAddressInfo::getMemberId, memberId)
);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index b38a622..2a55786 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -195,6 +195,7 @@
+address.getArea() +" - "
+address.getCity() +" - "
+address.getProvince() +" - "
+ +address.getCountryName() +" - "
+ address.getCountry() );
orderInfo.setLatitude(address.getLatitude());
orderInfo.setLongitude(address.getLongitude());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AddressInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AddressInfoVo.java
index 6894a15..8f33c1a 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AddressInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AddressInfoVo.java
@@ -40,6 +40,9 @@
@ApiModelProperty(value = "Country/Region")
private String country;
+
+ private String countryName;
+
/**
* 经度
*/
--
Gitblit v1.9.1