|
|
@@ -760,39 +760,43 @@ public class DfOrderServiceImpl implements IErpOrderService {
|
|
|
case 1:
|
|
|
break;
|
|
|
case 2:
|
|
|
- sBuilder.append("您好，您有一个包裹正在准备发货，请耐心等待;\n");
|
|
|
- if (order.getDeliverySn() != null && !order.getDeliverySn().isEmpty()) {
|
|
|
- sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
|
|
|
- }
|
|
|
- sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
|
|
|
break;
|
|
|
case 3:
|
|
|
- if ("202".equals(stateEx) || "301".equals(stateEx)) {
|
|
|
- //211
|
|
|
- //你好，这边查询到您购买的XXX（购买套餐）在XXX（时间）已经送到了，送货员电话为XXX（送货员信息）
|
|
|
- ErpDeliverysRequest erpDeliverysRequest = new ErpDeliverysRequest();
|
|
|
- erpDeliverysRequest.setCode(order.getOrderCode());
|
|
|
- ErpDeliverysResponse express = null;
|
|
|
- express = getDeliver(erpDeliverysRequest);
|
|
|
- sBuilder.append("这边查询到您有一个包裹 ");
|
|
|
- if (express != null && express.getDeliverys() != null && !express.getDeliverys().isEmpty()) {
|
|
|
- List<ErpDeliverys> deliverys = express.getDeliverys();
|
|
|
- ErpDeliverys tracesDTO = deliverys.get(deliverys.size() - 1);
|
|
|
- String remark = tracesDTO.getRemark();
|
|
|
- if (remark.contains("派送至本人") || remark.contains("签收")) {
|
|
|
- sBuilder.append(" 在").append(tracesDTO.getAcceptTime()).append("已经签收了\n");
|
|
|
- sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
|
|
|
- sBuilder.append("物流信息：").append(remark).append("\n");
|
|
|
+ //你好，这边查询到您购买的XXX（购买套餐）在XXX（时间）已经送到了，送货员电话为XXX（送货员信息）
|
|
|
+ ErpDeliverysRequest erpDeliverysRequest = new ErpDeliverysRequest();
|
|
|
+ erpDeliverysRequest.setCode(order.getOrderCode());
|
|
|
+ ErpDeliverysResponse express = null;
|
|
|
+ express = getDeliver(erpDeliverysRequest);
|
|
|
+ if (express != null && express.getDeliverys() != null && !express.getDeliverys().isEmpty()) {
|
|
|
+ List<ErpDeliverys> deliverys = express.getDeliverys();
|
|
|
+ ErpDeliverys tracesDTO = deliverys.get(deliverys.size() - 1);
|
|
|
+ String remark = tracesDTO.getRemark();
|
|
|
+
|
|
|
+ if ("0".equals(stateEx) || "1".equals(stateEx) || "2".equals(stateEx)) {
|
|
|
+ if (remark.contains("已收取快件")){
|
|
|
+ sBuilder.append("您好，您有一个包裹正在准备发货，请耐心等待;\n");
|
|
|
+ if (order.getDeliverySn() != null && !order.getDeliverySn().isEmpty()) {
|
|
|
+ sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
|
|
|
+ }
|
|
|
+ sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
|
|
|
}
|
|
|
+ } else if ("202".equals(stateEx)) {
|
|
|
if (remark.contains("正在派送")) {
|
|
|
+ sBuilder.append("这边查询到您有一个包裹 ");
|
|
|
sBuilder.append("正在派送中\n");
|
|
|
sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
|
|
|
sBuilder.append("物流信息：").append(remark).append("\n");
|
|
|
+ sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
|
|
|
+ }
|
|
|
+
|
|
|
+ } else if ("301".equals(stateEx)){
|
|
|
+ if (remark.contains("派送至本人") || remark.contains("签收")) {
|
|
|
+ sBuilder.append("这边查询到您有一个包裹 ");
|
|
|
+ sBuilder.append(" 在").append(tracesDTO.getAcceptTime()).append("已经签收了\n");
|
|
|
+ sBuilder.append(" 物流单号为：").append(order.getDeliverySn()).append("\n");
|
|
|
+ sBuilder.append("物流信息：").append(remark).append("\n");
|
|
|
}
|
|
|
- } else {
|
|
|
- sBuilder.append(" 已经送到了\n");
|
|
|
}
|
|
|
- sBuilder.append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
|
|
|
}
|
|
|
break;
|
|
|
case 4:
|
ct