feat(all): 结算单将品牌和收货单位id加到订单上

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
 	 */

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;

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
 	 */

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
 	 */

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);