From e46155862879868751a13253675626d443650309 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 16:49:09 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 3749999..cfc9dfc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -436,7 +436,7 @@
         JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
         Integer waitTime = jsonObject.getInteger("waitTime");
         redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
-    
+
         JSONObject jsonObject1 = JSON.parseObject(confirmDelivery.getCode());
         String com = jsonObject1.getString("com");
         String num = jsonObject1.getString("num");
@@ -446,6 +446,10 @@
         order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
         this.updateById(order);
         return R.ok();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
     }
     
     
@@ -989,7 +993,7 @@
                     throw new ServiceException("城市编码错误:"+cityCode, 500);
                 }
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("com", expressName);
+                jsonObject.put("com", companyNameByCode);
                 jsonObject.put("num", expressNum);
                 ConfirmDelivery confirmDelivery =new ConfirmDelivery();
                 confirmDelivery.setOrderId(order.getId());
@@ -1037,7 +1041,4 @@
         }
     }
 
-    public static void main(String[] args) throws MalformedURLException {
-        importExpress2("http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/69c1fcbe5c114f2a9f38703e4f5e1af0.xlsx");
-    }
 }

--
Gitblit v1.7.1