|
|
@@ -162,6 +162,8 @@ public class DfOrderServiceImpl implements IErpOrderService {
|
|
|
@Autowired
|
|
|
private LiveOrderMapper liveOrderMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private FsIntegralOrderLogsMapper fsIntegralOrderLogsMapper;
|
|
|
@Autowired
|
|
|
private LiveOrderItemMapper liveOrderItemMapper;
|
|
|
|
|
|
@@ -760,39 +762,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:
|
|
|
@@ -1053,10 +1059,12 @@ public class DfOrderServiceImpl implements IErpOrderService {
|
|
|
order.setStatus(1);//设置待发货状态
|
|
|
order.setDeliverySn("");
|
|
|
integralOrderMapper.updateById(order);
|
|
|
+ fsIntegralOrderLogsMapper.insert(FsIntegralOrderLogs.builder().orderId(order.getOrderId()).changeType(FsStoreOrderLogEnum.UPDATE_ORDER_DF.getValue()).changeMessage("运单不存在," + FsStoreOrderLogEnum.UPDATE_ORDER_DF.getDesc()).build());
|
|
|
} else {
|
|
|
log.info("积分订单物流被取消,退款积分订单{}",order.getOrderCode());
|
|
|
//以前查询到过物流信息,现在查不到,物流被人为取消
|
|
|
integralOrderService.mandatoryRefunds(order.getOrderCode());
|
|
|
+ fsIntegralOrderLogsMapper.insert(FsIntegralOrderLogs.builder().orderId(order.getOrderId()).changeType(FsStoreOrderLogEnum.REFUND_ORDER_DF.getValue()).changeMessage("运单不存在," + FsStoreOrderLogEnum.REFUND_ORDER_DF.getDesc()).build());
|
|
|
}
|
|
|
log.info("取消订单代服记录更新id{}",order.getOrderCode());
|
|
|
FsIntegralOrderDf df = new FsIntegralOrderDf();
|
|
|
@@ -1979,6 +1987,8 @@ public class DfOrderServiceImpl implements IErpOrderService {
|
|
|
order.setStatus(2);//修改积分订单为待收货状态
|
|
|
order.setDeliveryTime(DateUtils.getNowDate()); //更新发货时间
|
|
|
fsIntegralOrderMapper.updateById(order);
|
|
|
+ //订单发货日志
|
|
|
+ fsIntegralOrderLogsMapper.insert(FsIntegralOrderLogs.builder().orderId(order.getOrderId()).changeType("delivery_goods").changeMessage(FsStoreOrderLogEnum.DELIVERY_GOODS.getDesc()).build());
|
|
|
// fsStoreOrderLogsService.create(order.getOrderId(), FsStoreOrderLogEnum.DELIVERY_GOODS.getValue(), FsStoreOrderLogEnum.DELIVERY_GOODS.getDesc());
|
|
|
// redisCache.deleteObject(DELIVERY+":"+order.getOrderCode());
|
|
|
// if (order.getCompanyId() != null && order.getCompanyId() > 0) {
|