diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java index 73de9b9..cf53be6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java @@ -818,10 +818,26 @@ public class JDOrderController extends BaseController { */ private void sendEnterprisePushNotification(JDOrder order, String waybillNo, JSONObject logisticsData) { try { - // 构建推送消息内容(只包含:型号、收货地址、运单号) + // 构建推送消息内容 StringBuilder pushContent = new StringBuilder(); + + // 第一行:分销标识(F或PDD) + String distributionMark = order.getDistributionMark() != null ? order.getDistributionMark() : "未知"; + pushContent.append(distributionMark).append("\n"); + + // PDD订单包含第三方单号,F订单不包含 + if ("PDD".equals(distributionMark)) { + String thirdPartyOrderNo = order.getThirdPartyOrderNo(); + if (thirdPartyOrderNo != null && !thirdPartyOrderNo.trim().isEmpty()) { + pushContent.append("第三方单号:").append(thirdPartyOrderNo).append("\n"); + } + } + + // 型号 pushContent.append("型号:").append(order.getModelNumber() != null ? order.getModelNumber() : "无").append("\n"); + // 收货地址 pushContent.append("收货地址:").append(order.getAddress() != null ? order.getAddress() : "无").append("\n"); + // 运单号 pushContent.append("运单号:").append(waybillNo).append("\n"); // 调用企业微信推送接口(参考WxtsUtil的实现) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java index af55a14..e10ce48 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java @@ -120,10 +120,26 @@ public class LogisticsServiceImpl implements ILogisticsService { */ private void sendEnterprisePushNotification(JDOrder order, String waybillNo) { try { - // 构建推送消息内容(只包含:型号、收货地址、运单号) + // 构建推送消息内容 StringBuilder pushContent = new StringBuilder(); + + // 第一行:分销标识(F或PDD) + String distributionMark = order.getDistributionMark() != null ? order.getDistributionMark() : "未知"; + pushContent.append(distributionMark).append("\n"); + + // PDD订单包含第三方单号,F订单不包含 + if ("PDD".equals(distributionMark)) { + String thirdPartyOrderNo = order.getThirdPartyOrderNo(); + if (thirdPartyOrderNo != null && !thirdPartyOrderNo.trim().isEmpty()) { + pushContent.append("第三方单号:").append(thirdPartyOrderNo).append("\n"); + } + } + + // 型号 pushContent.append("型号:").append(order.getModelNumber() != null ? order.getModelNumber() : "无").append("\n"); + // 收货地址 pushContent.append("收货地址:").append(order.getAddress() != null ? order.getAddress() : "无").append("\n"); + // 运单号 pushContent.append("运单号:").append(waybillNo).append("\n"); // 调用企业微信推送接口