From e85ad6d1ffe56fb86ead3893c1ae138aee059270 Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Wed, 22 Nov 2023 18:42:08 +0800
Subject: [PATCH] =?UTF-8?q?ip=E9=9A=94=E7=A6=BB-=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=98=AF=E5=90=A6=E5=9C=A8=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/ip/IpRegionService.java        |  2 +-
 .../business/service/ip/IpRegionWhiteService.java   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java
index 7ad600f10..234e3c619 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java
@@ -48,7 +48,7 @@ public class IpRegionService {
             throw new ServiceException(BusiStatus.IP_REGION_HAD_LIMIT);
         }
 
-        if (whiteService.isInWhileList(account.getUid(), account.getPhone()) || envComponent.getDevEnv()){
+        if (whiteService.isInWhileList(account) || envComponent.getDevEnv()){
             return getNextTimestampInterval();
         }
 
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionWhiteService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionWhiteService.java
index 99d2d4dce..6ee123d24 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionWhiteService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionWhiteService.java
@@ -4,6 +4,7 @@ import com.accompany.business.model.ip.IpRegionWhite;
 import com.accompany.business.mybatismapper.ip.IpRegionWhiteMapper;
 import com.accompany.common.utils.CommonUtil;
 import com.accompany.core.base.SpringContextHolder;
+import com.accompany.core.model.Account;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
@@ -15,20 +16,24 @@ import java.util.Date;
 @Service
 public class IpRegionWhiteService extends ServiceImpl<IpRegionWhiteMapper, IpRegionWhite> {
 
-    public boolean isInWhileList(Long uid, String phone) {
-        Long whiteId = CommonUtil.checkValidPhone(phone)?
+    public boolean isInWhileList(Account account) {
+        Long uid = account.getUid();
+        String phoneAreaCode = account.getPhoneAreaCode();
+        String phone = account.getPhone();
+        Long whiteId = CommonUtil.checkPhoneFormat(phoneAreaCode, phone)?
                 baseMapper.getIpRegionWhileListByUidOrPhone(uid, phone):
                 baseMapper.getIpRegionWhileListByUid(uid);
         if (null == whiteId){
             return false;
         }
-        SpringContextHolder.getBean(IpRegionWhiteService.class).updateLastCheckTime(whiteId);
+        SpringContextHolder.getBean(IpRegionWhiteService.class).updateLastCheckTime(whiteId, uid);
         return true;
     }
 
     @Async
-    public void updateLastCheckTime(Long id) {
+    public void updateLastCheckTime(Long id, Long uid) {
         lambdaUpdate()
+                .set(IpRegionWhite::getUid, uid)
                 .set(IpRegionWhite::getLastCheckTime, new Date())
                 .eq(IpRegionWhite::getId, id)
                 .update();