完善 修改快递单号

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinMailTrackServiceImpl.java

@@ -219,6 +219,16 @@ public class GoblinMailTrackServiceImpl implements IGoblinMailTrackService {
                 log.warn("[mailTrack] callback missing mailId, nu={}", push.getLastResult().getNu());
                 return resp;
             }
+            // 改单号后 mailId 不变，旧订阅仍可能推送：仅接受与当前 mailNo 一致的推送
+            String pushNu = push.getLastResult() != null ? push.getLastResult().getNu() : null;
+            GoblinMailVo currentMail = findMail(orderId, mailId);
+            if (currentMail != null && StringUtils.isNotBlank(currentMail.getMailNo())
+                    && StringUtils.isNotBlank(pushNu)
+                    && !currentMail.getMailNo().trim().equalsIgnoreCase(pushNu.trim())) {
+                log.warn("[mailTrack] callback mailNo mismatch, ignore. mailId={}, currentMailNo={}, pushNu={}",
+                        mailId, currentMail.getMailNo(), pushNu);
+                return resp;
+            }
             GoblinMailTrackCache cache = redisUtils.getMailTrackCache(mailId);
             if (cache == null) {
                 cache = newEmptyCache(orderId, mailId);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -948,6 +948,8 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 )
         );
         if (cached != null) {
+            // 改单号后清掉旧轨迹，避免旧订阅推送与新单号互相覆盖；旧推送由回调 mailNo 校验丢弃
+            redisUtils.delMailTrackCache(mailId);
             goblinMailTrackService.initAndSubscribeAsync(orderId, mailId, cached.getMailNo(),
                     cached.getLogisticsCode(), cached.getLogisticsCompany());
         }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -1588,6 +1588,13 @@ public class GoblinRedisUtils {
         return (GoblinMailTrackCache) obj;
     }
 
+    public void delMailTrackCache(String mailId) {
+        if (!StringUtils.hasText(mailId)) {
+            return;
+        }
+        redisUtil.del(GoblinRedisConst.REDIS_GOBLIN_MAIL_TRACK.concat(mailId));
+    }
+
     // 获取 订单相关vo
     public GoblinStoreOrderVo getGoblinOrder(String orderId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER.concat(orderId);