From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/sh/service/impl/UserAddressServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 073e44f..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
@@ -42,13 +42,20 @@
     }
 
     @Override
-    public List<UserAddress> queryUserAddress() {
+    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
     @Transactional(rollbackFor = Exception.class)
     public void create(UserAddress resources) {
         if (resources.getIsDefault()) {

--
Gitblit v1.9.3