diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java index dab77fae5..2170fed75 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.XmlUtil; import cn.hutool.json.JSONUtil; @@ -159,7 +158,7 @@ public class ExpressCallbackController extends XktBaseController { StoreOrderExpressTrackAddDTO dto = new StoreOrderExpressTrackAddDTO(); dto.setExpressWaybillNo(ytTrack.getMailNo()); dto.setAction(ytTrack.getInfoContent()); - dto.setDescription(DateUtil.formatDateTime(ytTrack.getAcceptTime()) + " " + ytTrack.getRemark()); + dto.setDescription(StrUtil.nullToEmpty(ytTrack.getAcceptTime()) + " " + ytTrack.getRemark()); dto.setExpressId(EExpressChannel.YTO.getExpressId()); switch (ytTrack.getInfoContent()) { case "GOT": diff --git a/xkt/src/main/java/com/ruoyi/xkt/thirdpart/yto/YtoTrackObj.java b/xkt/src/main/java/com/ruoyi/xkt/thirdpart/yto/YtoTrackObj.java index 6660f4560..f28991adc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/thirdpart/yto/YtoTrackObj.java +++ b/xkt/src/main/java/com/ruoyi/xkt/thirdpart/yto/YtoTrackObj.java @@ -48,7 +48,7 @@ public class YtoTrackObj { /** * 事件发生时间 */ - private Date acceptTime; + private String acceptTime; /** * 备注或失败原因(值为中文原因或备注) */