From b39de2a613e7ab67456730209b759481b6e5174e Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Thu, 6 Mar 2025 09:23:24 +0800
Subject: [PATCH] =?UTF-8?q?change-name:=20Country=20=3D>=20CountryCode=20f?=
 =?UTF-8?q?eat:=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=BC=93=E5=AD=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/Forewarning/AreaCacheEntry.cs                       | 2 +-
 .../Services/ForewarningServices/ForewarningCacheService.cs  | 2 +-
 .../Services/ForewarningServices/ForewarningNotifyService.cs | 2 +-
 src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs        | 2 +-
 src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs  | 2 +-
 src/SJZY.Track.Repository/Repositories/OrderRepository.cs    | 5 ++++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs
index c4de4ba6..4c16c507 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/Forewarning/AreaCacheEntry.cs
@@ -5,7 +5,7 @@ public class AreaCacheEntry
     /// <summary>
     /// 国家或地区
     /// </summary>
-    public string Country { get; set; } = null!;
+    public string CountryCode { get; set; } = null!;
 
     /// <summary>
     /// 省份
diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs
index 88c7582d..445f5639 100644
--- a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs
+++ b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs
@@ -180,7 +180,7 @@ public class ForewarningCacheService : IForewarningCacheService, ISingletonDepen
     {
         return new AreaCacheEntry
         {
-            Country = model.Country,
+            CountryCode = model.CountryCode,
             Province = model.Province,
             City = model.City,
             LeftPostcode = model.LeftPostcode,
diff --git a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs
index 692a5646..9fff7ed4 100644
--- a/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs
+++ b/src/SJZY.Track.Application/Services/ForewarningServices/ForewarningNotifyService.cs
@@ -322,7 +322,7 @@ public class ForewarningNotifyService : IForewarningNotifyService, ITransientDep
             if (!rule.Areas.IsNullOrEmpty())
             {
                 var inArea = false;
-                var areas = rule.Areas!.Where(area => order.ArrivalCountry == area.Country).ToList();
+                var areas = rule.Areas!.Where(area => order.ArrivalCountry == area.CountryCode).ToList();
                 foreach (var area in areas)
                 {
                     if (!area.LeftPostcode.IsNullOrEmpty() && !area.RightPostcode.IsNullOrEmpty())
diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs
index 7df79baf..3b249ffb 100644
--- a/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs
+++ b/src/SJZY.Track.Domain/Dtos/Forewarning/KpiAreaInfo.cs
@@ -7,7 +7,7 @@ public class KpiAreaInfo
     /// <summary>
     /// 国家或地区
     /// </summary>
-    public string Country { get; set; } = null!;
+    public string CountryCode { get; set; } = null!;
 
     /// <summary>
     /// 省份
diff --git a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs b/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs
index 1563b770..9343b4fc 100644
--- a/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/KpiAreaRepository.cs
@@ -102,7 +102,7 @@ public class KpiAreaRepository : BasicRepository<RuleAreaEntity>, IKpiAreaReposi
             .Select((r, i) => new KpiAreaInfo
             {
                 AreaId = r.AreaId,
-                Country = r.CountryCode,
+                CountryCode = r.CountryCode,
                 LeftPostcode = r.LeftPostcode,
                 City = r.City,
                 Province = r.Province,
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index c308d980..ace340fa 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -65,8 +65,10 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
     public async Task<Dictionary<string, string>> GetTrackOrderTypeDictAsync()
     {
         const string key = "TrackOrderType";
+        var isRefresh = false;
         var orderTypes = await _memoryCache.GetOrCreateAsync(key, async (entry) =>
         {
+            isRefresh = true;
             // 固定时间周期后强制更新
             entry.AbsoluteExpirationRelativeToNow = _orderTypeCacheTimeSpan;
             // 查询主数据
@@ -76,7 +78,8 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         });
 
         // 更新redis缓存
-        await RedisHelper.Client.HMSetAsync(GlobalConst.TrackOrderTypeKey, orderTypes);
+        if (isRefresh)
+            await RedisHelper.Client.HMSetAsync(GlobalConst.TrackOrderTypeKey, orderTypes);
 
         // redis内数据只更新不清理
         var dict = RedisHelper.Client.HGetAll<string>(GlobalConst.TrackOrderTypeKey);