CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
荒
2025-11-05 21:26:45 +08:00
parent 9d8f273513
commit f89fc12108
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java
View File

@@ -818,10 +818,26 @@ public class JDOrderController extends BaseController {
*/ */
private void sendEnterprisePushNotification(JDOrder order, String waybillNo, JSONObject logisticsData) { private void sendEnterprisePushNotification(JDOrder order, String waybillNo, JSONObject logisticsData) {
try { try {
// 构建推送消息内容（只包含：型号、收货地址、运单号） // 构建推送消息内容
StringBuilder pushContent = new StringBuilder(); 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.getModelNumber() != null ? order.getModelNumber() : "无").append("\n");
// 收货地址
pushContent.append("收货地址：").append(order.getAddress() != null ? order.getAddress() : "无").append("\n"); pushContent.append("收货地址：").append(order.getAddress() != null ? order.getAddress() : "无").append("\n");
// 运单号
pushContent.append("运单号：").append(waybillNo).append("\n"); pushContent.append("运单号：").append(waybillNo).append("\n");
// 调用企业微信推送接口（参考WxtsUtil的实现） // 调用企业微信推送接口（参考WxtsUtil的实现）

18
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java
View File

@@ -120,10 +120,26 @@ public class LogisticsServiceImpl implements ILogisticsService {
*/ */
private void sendEnterprisePushNotification(JDOrder order, String waybillNo) { private void sendEnterprisePushNotification(JDOrder order, String waybillNo) {
try { try {
// 构建推送消息内容（只包含：型号、收货地址、运单号） // 构建推送消息内容
StringBuilder pushContent = new StringBuilder(); 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.getModelNumber() != null ? order.getModelNumber() : "无").append("\n");
// 收货地址
pushContent.append("收货地址：").append(order.getAddress() != null ? order.getAddress() : "无").append("\n"); pushContent.append("收货地址：").append(order.getAddress() != null ? order.getAddress() : "无").append("\n");
// 运单号
pushContent.append("运单号：").append(waybillNo).append("\n"); pushContent.append("运单号：").append(waybillNo).append("\n");
// 调用企业微信推送接口 // 调用企业微信推送接口