From 1fe6e2f6aa7cb88c63cff0afc3230e85a8d7983c Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 17 Jun 2024 16:49:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=B0=86=E5=93=81=E7=89=8C=E5=92=8C=E6=94=B6=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E4=BD=8Did=E5=8A=A0=E5=88=B0=E8=AE=A2=E5=8D=95=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StatisticsDistributionPackageEntity.java | 12 ------------ .../statistics/entity/StatisticsOrderInfoEntity.java | 12 ++++++++++++ .../entity/StatisticsTrunklinePackageEntity.java | 12 ------------ .../entity/StatisticsWarehousePackageEntity.java | 12 ------------ .../listener/mq/WaybillFanoutListener.java | 8 ++------ 5 files changed, 14 insertions(+), 42 deletions(-) diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java index 479757f54..cd08e40ca 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java @@ -42,18 +42,6 @@ public class StatisticsDistributionPackageEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; - /** - * 品牌id - */ - @ApiModelProperty(value = "品牌id") - private Long brandId; - - /** - * 收货单位id - */ - @ApiModelProperty(value = "收货单位id") - private Long consigneeId; - /** * 仓库id */ diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsOrderInfoEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsOrderInfoEntity.java index 276adeb64..cbb0f054d 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsOrderInfoEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsOrderInfoEntity.java @@ -42,6 +42,18 @@ public class StatisticsOrderInfoEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; + /** + * 品牌id + */ + @ApiModelProperty(value = "品牌id") + private Long brandId; + + /** + * 收货单位id + */ + @ApiModelProperty(value = "收货单位id") + private Long consigneeId; + private String orderCode; private Long waybillId; diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java index c89e4de46..47090521e 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java @@ -53,18 +53,6 @@ public class StatisticsTrunklinePackageEntity extends TenantEntity { @ApiModelProperty(value = "仓库名称") private String warehouseName; - /** - * 品牌id - */ - @ApiModelProperty(value = "品牌id") - private Long brandId; - - /** - * 收货单位id - */ - @ApiModelProperty(value = "收货单位id") - private Long consigneeId; - /** * 运单id */ diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java index b06105f67..72af3167a 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java @@ -42,18 +42,6 @@ public class StatisticsWarehousePackageEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; - /** - * 品牌id - */ - @ApiModelProperty(value = "品牌id") - private Long brandId; - - /** - * 收货单位id - */ - @ApiModelProperty(value = "收货单位id") - private Long consigneeId; - /** * 仓库id */ 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 d347ce8bc..2f7b5bd29 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 @@ -72,8 +72,6 @@ public class WaybillFanoutListener { //干线 StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity(); - statisticsTrunklinePackageEntity.setBrandId(brandId); - statisticsTrunklinePackageEntity.setConsigneeId(consigneeId); statisticsTrunklinePackageEntity.setWarehouseId(warehouseId); statisticsTrunklinePackageEntity.setWarehouseName(warehouseName); statisticsTrunklinePackageEntity.setTypeService(typeService); @@ -122,8 +120,6 @@ public class WaybillFanoutListener { //仓库 StatisticsWarehousePackageEntity statisticsWarehousePackageEntity = new StatisticsWarehousePackageEntity(); - statisticsWarehousePackageEntity.setBrandId(brandId); - statisticsWarehousePackageEntity.setConsigneeId(consigneeId); statisticsWarehousePackageEntity.setWarehouseId(warehouseId); statisticsWarehousePackageEntity.setWarehouseName(warehouseName); statisticsWarehousePackageEntity.setTypeService(typeService); @@ -159,8 +155,6 @@ public class WaybillFanoutListener { //配送 StatisticsDistributionPackageEntity statisticsDistributionPackageEntity = new StatisticsDistributionPackageEntity(); - statisticsDistributionPackageEntity.setBrandId(brandId); - statisticsDistributionPackageEntity.setConsigneeId(consigneeId); statisticsDistributionPackageEntity.setWarehouseId(warehouseId); statisticsDistributionPackageEntity.setWarehouseName(warehouseName); statisticsDistributionPackageEntity.setTypeService(typeService); @@ -222,6 +216,8 @@ public class WaybillFanoutListener { trunklineMap.keySet().forEach(key -> { StatisticsOrderInfoEntity statisticsOrderInfoEntity = new StatisticsOrderInfoEntity(); + statisticsOrderInfoEntity.setBrandId(brandId); + statisticsOrderInfoEntity.setConsigneeId(consigneeId); statisticsOrderInfoEntity.setWaybillId(waybillId); statisticsOrderInfoEntity.setWaybillNo(waybillNo); statisticsOrderInfoEntity.setOrderCode(key);