From 634125daa0b225c5472e4bc5bdfc94a63cab68d2 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 12 Dec 2025 19:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/data/kuaidi100/KuaiDi100Utils.java    | 20 ++++++++++++++++++-
 .../controller/mm/AdminOrderController.java   |  2 +-
 .../controller/vv/AppReverseController.java   |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/KuaiDi100Utils.java b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/KuaiDi100Utils.java
index ed0c4e6..b4d2a91 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/KuaiDi100Utils.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/KuaiDi100Utils.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.heyu.api.data.dto.vv.KuaiDi100DTO;
+import com.heyu.api.data.utils.StringUtils;
 import com.kuaidi100.sdk.api.QueryTrack;
 import com.kuaidi100.sdk.api.Subscribe;
 import com.kuaidi100.sdk.contant.ApiInfoConstant;
@@ -72,9 +73,19 @@ public class KuaiDi100Utils {
     /**
      * 订阅接口
      */
-    public static String subscribe(String companyCode, String trackNumber, String phone)  {
+    public static String subscribe( String trackNumber, String phone)  {
         try {
             SubscribeParameters subscribeParameters = new SubscribeParameters();
+            String companyCode = null;
+
+            if(StringUtils.isBlank(companyCode)){
+
+                KuaiDi100DTO kuaiDi100DTO =  getLogisticsInfo(trackNumber);
+                if(kuaiDi100DTO != null){
+                    companyCode = kuaiDi100DTO.getCom();
+                }
+
+            }
             subscribeParameters.setCallbackurl("https://api.1024api.com/api-interface/app/kuaidi/callback");
             subscribeParameters.setPhone(phone);
 
@@ -100,4 +111,11 @@ public class KuaiDi100Utils {
         }
         return null;
     }
+
+
+    public static void main(String[] args) {
+        subscribe( "773394957915732", "18458195149");
+    }
+
+
 }
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
index b2fa21e..878e63c 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
@@ -268,7 +268,7 @@ public class AdminOrderController {
             VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber());
 
             //  创建订阅
-            KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvTradeOrderLineEntityList.get(0).getBuyerPhone());
+            KuaiDi100Utils.subscribe( vvPackageEntityNew.getTrackNumber(), vvTradeOrderLineEntityList.get(0).getBuyerPhone());
         } catch (Exception e) {
             log.error("AdminOrderController subscribe KuaiDi100 Utils.subscribe error", e);
         }
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java
index d6aecc4..cb14fa9 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java
@@ -139,7 +139,7 @@ public class AppReverseController {
         Long sellerWarehouseId = NumberUtil.objToLongDefault(vvPackageEntity.getSellerWarehouseId(), 1);
         VvSellerWarehouseEntity vvSellerWarehouseEntity = vvSellerWarehouseDao.selectVvSellerWarehouseById(sellerWarehouseId);
         //  创建订阅
-        KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvSellerWarehouseEntity.getWarehousePhone());
+        KuaiDi100Utils.subscribe( vvPackageEntityNew.getTrackNumber(), vvSellerWarehouseEntity.getWarehousePhone());
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             tradeOrderLineEntity.setStatus(ReverseStatusEnums.shipping.getStatus());              // 已经发货
             vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);