Merge remote-tracking branch 'origin/企微聊天' into 企微聊天

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -885,6 +885,14 @@ public class DfOrderServiceImpl implements IErpOrderService {
                                                             sBuilder.append("物流状态：").append("1".equals(stateEx) ? "已揽收" : "运输中").append("\n");
                                                         }
                                                         sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
+                                                    } else {
+                                                        sBuilder.append("您好，您有一个包裹在运输途中，请耐心等待;\n");
+                                                        if (order.getDeliverySn() != null && !order.getDeliverySn().isEmpty()) {
+                                                            sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
+                                                        }
+
+                                                        sBuilder.append("物流信息：").append(remark).append("\n");
+                                                        sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
                                                     }
                                                 } else if ("202".equals(stateEx)) {
                                                     if (remark.contains("正在派送")) {
@@ -1371,6 +1379,14 @@ public class DfOrderServiceImpl implements IErpOrderService {
                                                         sBuilder.append("物流状态：").append("1".equals(stateEx) ? "已揽收" : "运输中").append("\n");
                                                     }
                                                     sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
+                                                } else {
+                                                    sBuilder.append("您好，您有一个包裹在运输途中，请耐心等待;\n");
+                                                    if (order.getDeliverySn() != null && !order.getDeliverySn().isEmpty()) {
+                                                        sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
+                                                    }
+
+                                                    sBuilder.append("物流信息：").append(remark).append("\n");
+                                                    sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
                                                 }
                                             } else if ("202".equals(stateEx)) {
                                                 if (remark.contains("正在派送")) {