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 2170fed75..e4614048b 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 @@ -99,8 +99,9 @@ public class ExpressCallbackController extends XktBaseController { } @ApiOperation("中通-轨迹推送") - @PostMapping(value = "zto/track") - public String ztoTrack(@RequestBody ZtoTrackObj.Request request) { + @RequestMapping(value = "zto/track") + public String ztoTrack(HttpServletRequest servletRequest) { + ZtoTrackObj.Request request = new ZtoTrackObj.Request(servletRequest); if (StrUtil.isNotBlank(request.getData()) && //验签 ZopDigestUtil.verify(request.getData_digest(), request.getData(), ztoAppSecret)) { @@ -158,7 +159,7 @@ public class ExpressCallbackController extends XktBaseController { StoreOrderExpressTrackAddDTO dto = new StoreOrderExpressTrackAddDTO(); dto.setExpressWaybillNo(ytTrack.getMailNo()); dto.setAction(ytTrack.getInfoContent()); - dto.setDescription(StrUtil.nullToEmpty(ytTrack.getAcceptTime()) + " " + ytTrack.getRemark()); + dto.setDescription(StrUtil.subPre(ytTrack.getAcceptTime(), 19) + " " + ytTrack.getRemark()); dto.setExpressId(EExpressChannel.YTO.getExpressId()); switch (ytTrack.getInfoContent()) { case "GOT": diff --git a/xkt/src/main/java/com/ruoyi/xkt/thirdpart/zto/ZtoTrackObj.java b/xkt/src/main/java/com/ruoyi/xkt/thirdpart/zto/ZtoTrackObj.java index 4526eeedb..6381659b5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/thirdpart/zto/ZtoTrackObj.java +++ b/xkt/src/main/java/com/ruoyi/xkt/thirdpart/zto/ZtoTrackObj.java @@ -6,6 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import javax.servlet.http.HttpServletRequest; + /** * @author liangyq * @date 2025-05-06 23:00 @@ -22,7 +24,7 @@ public class ZtoTrackObj { /** * 事件类型 *

- * GOT   收件   网点揽收 + * GOT   收件   网点揽收 *  DEPARTURE   发件   从网点或分拨中心发出 *  ARRIVAL   到件   到达网点或分拨中心 *  DISPATCH   派件   业务员派送 @@ -151,6 +153,8 @@ public class ZtoTrackObj { } @Data + @AllArgsConstructor + @NoArgsConstructor public static class Request { /** * 消息内容 @@ -170,5 +174,12 @@ public class ZtoTrackObj { * 应用appKey */ private String company_id; + + public Request(HttpServletRequest servletRequest) { + this(servletRequest.getParameter("data"), + servletRequest.getParameter("data_digest"), + servletRequest.getParameter("msg_type"), + servletRequest.getParameter("company_id")); + } } }