From 974c2f29b973d489512146cc8c7fa58448368959 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 29 十一月 2024 14:03:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 5ca3e21..e85907f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.account.util.weChat.WeChatUtil;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.BaseTable;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
@@ -224,12 +223,12 @@
appUser.setLongitude(registerAccount.getLongitude());
appUser.setLatitude(registerAccount.getLatitude());
//调用地图获取省市区数据
- appUser.setProvince();
- appUser.setProvinceCode();
- appUser.setCity();
- appUser.setCityCode();
- appUser.setDistrict();
- appUser.setDistrictCode();
+// appUser.setProvince();
+// appUser.setProvinceCode();
+// appUser.setCity();
+// appUser.setCityCode();
+// appUser.setDistrict();
+// appUser.setDistrictCode();
this.save(appUser);
}
LoginVo loginVo = new LoginVo();
@@ -272,15 +271,12 @@
* @return
*/
@Override
- public BaseTable<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
+ public List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
//使用地图获取省市区数据
String longitude = nearbyReferrer.getLongitude();
String latitude = nearbyReferrer.getLatitude();
String cityCode = "";
List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(cityCode, nearbyReferrer);
- BaseTable baseTable = new BaseTable();
- baseTable.setRows(list);
- baseTable.setTotal(list.size());
- return baseTable;
+ return list;
}
}
--
Gitblit v1.7.1