编辑快递没变化不重新订阅

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

@@ -918,8 +918,25 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         if (orderVo == null || !orderVo.getStoreId().equals(storeInfoVo.getStoreId())) {
             return ResponseDto.failure("无法查看");
         }
+        GoblinMailVo origin = null;
+        for (GoblinMailVo m : redisUtils.getGoblinMail(orderId)) {
+            if (mailId.equals(m.getMailId())) {
+                origin = m;
+                break;
+            }
+        }
+        if (origin == null) {
+            return ResponseDto.failure("快递信息不存在");
+        }
+        String newMailNo = mailNo == null ? "" : mailNo.trim();
+        String newCode = StringUtils.isNotBlank(logisticsCode) ? logisticsCode.trim().toLowerCase() : StringUtils.defaultString(origin.getLogisticsCode());
+        String oldMailNo = StringUtils.defaultString(origin.getMailNo());
+        String oldCode = StringUtils.defaultString(origin.getLogisticsCode());
+        boolean mailChanged = !oldMailNo.equals(newMailNo)
+                || !oldCode.equalsIgnoreCase(StringUtils.defaultString(newCode));
+
         GoblinMailVo vo = GoblinMailVo.getNew();
-        vo.setMailNo(mailNo);
+        vo.setMailNo(newMailNo);
         vo.setMailId(mailId);
         vo.setOrderId(orderId);
         if (StringUtils.isNotBlank(logisticsCompany)) {
@@ -930,7 +947,6 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         }
         redisUtils.changeGoblinMail(orderId, vo);
         mongoUtils.updateGoblinMailVo(mailId, vo);
-        //添加日志
         GoblinMailVo cached = null;
         for (GoblinMailVo m : redisUtils.getGoblinMail(orderId)) {
             if (mailId.equals(m.getMailId())) {
@@ -947,8 +963,8 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                         LocalDateTime.now(), vo.getMailId()
                 )
         );
-        if (cached != null) {
-            // 改单号后清掉旧轨迹，避免旧订阅推送与新单号互相覆盖；旧推送由回调 mailNo 校验丢弃
+        if (mailChanged && cached != null) {
+            // 单号或公司编码变了才清缓存并重新订阅，避免无变化重复占用订阅次数
             redisUtils.delMailTrackCache(mailId);
             goblinMailTrackService.initAndSubscribeAsync(orderId, mailId, cached.getMailNo(),
                     cached.getLogisticsCode(), cached.getLogisticsCompany());