From 1784f4bc03a5cb02b9c89a229b7d95fdeaa6dcd2 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 17 Jun 2024 15:14:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E5=8D=95=E5=8A=A0=E4=B8=8A=E5=93=81?= =?UTF-8?q?=E7=89=8Cid=E5=92=8C=E6=94=B6=E8=B4=A7=E5=8D=95=E4=BD=8Did?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/carsload/CarsLoadLogTypeConstant.java | 5 ++++- .../logpm/statistics/listener/mq/WaybillFanoutListener.java | 2 ++ .../trunkline/service/impl/OpenOrderAsyncServiceImpl.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/carsload/CarsLoadLogTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/carsload/CarsLoadLogTypeConstant.java index 4b89ada7e..302cbe559 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/carsload/CarsLoadLogTypeConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/carsload/CarsLoadLogTypeConstant.java @@ -21,7 +21,10 @@ public enum CarsLoadLogTypeConstant { CANCEL_NET_START_CARS_LOAD("网点取消发车",12), END_ARRIVE_CARS_LOAD("终点到达",13), CANCEL_END_ARRIVE_CARS_LOAD("终点取消到达",14), - END_UNLOAD_CARS_LOAD("终点卸车",15); + END_UNLOAD_CARS_LOAD("终点卸车",15), + TRIPARTITE_TRANSFER_SIGN("三方中转签收",16), + TRIPARTITE_TRANSFER_SETTLEMENT("三方中转结算",17), + SEND_DIRECTLY_SIGN("直发商家签收",18); /** * 描述 diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java index fc9470b26..941f6db4d 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java @@ -51,6 +51,8 @@ public class WaybillFanoutListener { String waybillNo = jsonObject.getStr("waybillNo"); String typeService = jsonObject.getStr("typeService");//服务类型 Integer waybillType = jsonObject.getInt("waybillType"); + Long brandId = jsonObject.getLong("brandId"); + Long consigneeId = jsonObject.getLong("consigneeId"); List statisticsTrunklinePackageEntities = new ArrayList<>(); List statisticsWarehousePackageEntities = new ArrayList<>(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java index 7b87e3174..f6efb044a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java @@ -359,6 +359,8 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService { jsonObject.put("waybillId",waybillEntity.getId()); jsonObject.put("waybillNo",waybillNo); jsonObject.put("waybillType",waybillType); + jsonObject.put("brandId",waybillEntity.getBrandId()); + jsonObject.put("consigneeId",waybillEntity.getConsigneeId()); Long consigneeId = waybillEntity.getConsigneeId(); BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); if(Objects.isNull(basicdataClientEntity)){