From 2bc35df79fca920ad584a82b5ea7b35b6ca7b8a0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 10:12:57 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 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 150588f..6f84c3e 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
@@ -10,6 +10,7 @@
 import com.ruoyi.account.api.model.*;
 import com.ruoyi.account.mapper.AppUserMapper;
 import com.ruoyi.account.service.*;
+import com.ruoyi.account.util.GeodesyUtil;
 import com.ruoyi.account.util.SMSUtil;
 import com.ruoyi.account.util.payment.PaymentUtil;
 import com.ruoyi.account.util.payment.model.CloseOrderResult;
@@ -21,6 +22,7 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.redis.annotation.DistributedLock;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.*;
@@ -287,6 +289,7 @@
 			appUser = appUser1;
 		}else if(null == appUser){
 			appUser = new AppUser();
+			appUser.setAvatar(registerAccount.getAvatar());
 			appUser.setName(registerAccount.getName());
 			appUser.setPhone(registerAccount.getPhone());
 			appUser.setWxOpenid(openid);
@@ -688,6 +691,42 @@
 			String cityCode = citycode.substring(0, 4) + "00";
 			PageInfo<NearbyReferrerVo> pageInfo = new PageInfo(nearbyReferrer.getPageCurr(), nearbyReferrer.getPageSize());
 			List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(pageInfo, cityCode, nearbyReferrer);
+			for (NearbyReferrerVo nearbyReferrerVo : list) {
+				switch (nearbyReferrerVo.getVip()){
+					case "1":
+						nearbyReferrerVo.setVip("普通会员");
+						break;
+					case "2":
+						nearbyReferrerVo.setVip("黄金会员");
+						break;
+					case "3":
+						nearbyReferrerVo.setVip("钻石会员");
+						break;
+					case "4":
+						nearbyReferrerVo.setVip("准代理");
+						break;
+					case "5":
+						nearbyReferrerVo.setVip("代理");
+						break;
+					case "6":
+						nearbyReferrerVo.setVip("总代");
+						break;
+					case "7":
+						nearbyReferrerVo.setVip("合伙人");
+						break;
+				}
+
+				String latitude = nearbyReferrerVo.getLatitude();
+				String longitude = nearbyReferrerVo.getLongitude();
+				Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, nearbyReferrer.getLongitude() + "," + nearbyReferrer.getLatitude()).get("WGS84");
+				nearbyReferrerVo.setDistance(wgs84);
+			}
+			list.sort(new Comparator<NearbyReferrerVo>() {
+				@Override
+				public int compare(NearbyReferrerVo o1, NearbyReferrerVo o2) {
+					return o1.getDistance().compareTo(o2.getDistance());
+				}
+			});
 			return pageInfo.setRecords(list);
 		}
 		return null;

--
Gitblit v1.7.1