From 7ece553fd95f30dcfafa66f667ef9d0c064a22e6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:27:12 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/UserAddressServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/UserAddressServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/UserAddressServiceImpl.java
index eda7218..d1dfe1c 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/UserAddressServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/UserAddressServiceImpl.java
@@ -14,12 +14,9 @@
import org.springframework.transaction.annotation.Transactional;
import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
import com.oying.utils.PageResult;
@@ -42,6 +39,20 @@
@Override
public List<UserAddress> queryAll(UserAddressQueryCriteria criteria) {
return userAddressMapper.findAll(criteria);
+ }
+
+ @Override
+ public List<UserAddress> queryUserAddress(double longitude, double latitude) {
+ UserAddressQueryCriteria criteria = new UserAddressQueryCriteria();
+ criteria.setUserId(SecurityUtils.getCurrentUserId());
+ criteria.setLongitude(longitude);
+ criteria.setLatitude(latitude);
+ return queryAll(criteria);
+ }
+
+ @Override
+ public UserAddress getById(Long addressId, Double longitude, Double latitude) {
+ return userAddressMapper.getById(addressId, SecurityUtils.getCurrentUserId(), longitude, latitude);
}
@Override
@@ -90,6 +101,7 @@
map.put("城市", userAddress.getCity());
map.put("区县", userAddress.getDistrict());
map.put("街道", userAddress.getStreet());
+ map.put("短地址", userAddress.getShortAddress());
map.put("详细地址", userAddress.getDetail());
map.put("经度", userAddress.getLongitude());
map.put("纬度", userAddress.getLatitude());
--
Gitblit v1.9.3