1.结算代码提交

blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java

@@ -38,6 +38,19 @@ public abstract class FanoutConstants {
 
 		}
 
+		//包件日志
+		interface PACKAGNODE{
+
+			//交换机
+			String EXCHANGE = "fanout.trunkline.packagenode" + ModuleNameConstant.DEVAUTH;
+
+			interface QUEUE {
+
+				String PACKAGE_SIGN = "fanout.trunkline.packagenode.statisticsdata.packagesign" + ModuleNameConstant.DEVAUTH;
+
+			}
+
+		}
 
 	}
 

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java

@@ -0,0 +1,17 @@
+package com.logpm.statistics.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MerchantStatisticsDTO implements Serializable {
+
+	private Integer pageSize;
+	private Integer pageNum;
+
+	private Long waybillInfoId;
+
+	private Long orderInfoId;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java

@@ -0,0 +1,132 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("logpm_statistics_distribution_package")
+@ApiModel(value = "StatisticsDistributionPackage对象", description = "结算配送包件明细表")
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsDistributionPackageEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	/**
+	 * 运单id
+	 */
+	@ApiModelProperty(value = "运单id")
+	private Long waybillId;
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
+
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String orderPackageCode;
+
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类名称")
+	private String productName;
+
+	/**
+	 * 件数
+	 */
+	@ApiModelProperty(value = "件数")
+	private Integer totalNum;
+
+	/**
+	 * 重量
+	 */
+	@ApiModelProperty(value = "重量")
+	private BigDecimal totalWeight;
+
+	@ApiModelProperty(value = "体积")
+	private BigDecimal totalVolume;
+
+	private BigDecimal openPrice;
+	private BigDecimal totalPrice;
+	private BigDecimal deliveryServiceFee;
+	private BigDecimal deliveryFee;
+	private BigDecimal deliveryLoadingFee;
+	private BigDecimal deliverySortingFee;
+	private BigDecimal deliveryUpfloorFee;
+	private BigDecimal deliveryMoveFee;
+	private BigDecimal deliveryDistance;
+	private BigDecimal deliveryCrossingFee;
+	private Integer isAftersales;
+	private BigDecimal aftersalesPrice;
+	private Integer hasStatement;
+	private Long statementCreateTime;
+	private String statementCreateUser;
+	private Integer isZero;
+	private BigDecimal realDeliveryServiceFee;
+	private BigDecimal realDeliveryFee;
+	private BigDecimal realDeliveryLoadingFee;
+	private BigDecimal realDeliverySortingFee;
+	private BigDecimal realDeliveryUpfloorFee;
+	private BigDecimal realDeliveryMoveFee;
+	private BigDecimal realDeliveryDistance;
+	private BigDecimal realDeliveryCrossingFee;
+	private Integer goodsType; //1 订制品  2零担  3库存品
+	private String typeService; //1 商配  2市配  3自提  4三方中转
+
+	private Long orderInfoId;
+
+	private Integer isSign;//是否签收 0否 1是
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsOrderInfoEntity.java

@@ -43,6 +43,12 @@ public class StatisticsOrderInfoEntity extends TenantEntity {
 	private String orderCode;
 	private Long waybillId;
 	private String waybillNo;
+	private String typeService;
+	private Integer signStatus;// 签收状态 0未签收 1部分签收 2已签收
 
+	private Integer confirmStatisticsOrder;//0未确认 1已确认
+
+	private Long waybillInfoId;//运单维度id
+	private Long statisticsOrderId;//结算单id
 
 }

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java

@@ -8,13 +8,12 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
-@TableName("logpm_statistics_package_info")
-@ApiModel(value = "StatisticsPackageInfo对象", description = "结算包件明细表")
+@TableName("logpm_statistics_trunkline_package")
+@ApiModel(value = "StatisticsTrunklinePackage对象", description = "结算干线包件明细表")
 @EqualsAndHashCode(callSuper = true)
-public class StatisticsPackageInfoEntity extends TenantEntity {
+public class StatisticsTrunklinePackageEntity extends TenantEntity {
 
 	/**
 	 * 预留1
@@ -103,22 +102,6 @@ public class StatisticsPackageInfoEntity extends TenantEntity {
 	private BigDecimal totalPrice;
 	private BigDecimal pickupFee;
 	private BigDecimal freightFee;
-	private Date incomingTime;
-	private Date outingTime;
-	private String warehouseFeeInterval;
-	private BigDecimal warehouseServiceFee;
-	private BigDecimal warehouseFee;
-	private BigDecimal warehouseManageFee;
-	private BigDecimal warehouseSortingFee;
-	private BigDecimal warehouseOperatingFee;
-	private BigDecimal deliveryServiceFee;
-	private BigDecimal deliveryFee;
-	private BigDecimal deliveryLoadingFee;
-	private BigDecimal deliverySortingFee;
-	private BigDecimal deliveryUpfloorFee;
-	private BigDecimal deliveryMoveFee;
-	private BigDecimal deliveryDistance;
-	private BigDecimal deliveryCrossingFee;
 	private BigDecimal installFee;
 	private BigDecimal quotationFee;
 	private BigDecimal claimingValue;
@@ -137,20 +120,6 @@ public class StatisticsPackageInfoEntity extends TenantEntity {
 	private Integer isZero;
 	private BigDecimal realPickupFee;
 	private BigDecimal realFreightFee;
-	private String realWarehouseFeeInterval;
-	private BigDecimal realWarehouseServiceFee;
-	private BigDecimal realWarehouseFee;
-	private BigDecimal realWarehouseManageFee;
-	private BigDecimal realWarehouseSortingFee;
-	private BigDecimal realWarehouseOperatingFee;
-	private BigDecimal realDeliveryServiceFee;
-	private BigDecimal realDeliveryFee;
-	private BigDecimal realDeliveryLoadingFee;
-	private BigDecimal realDeliverySortingFee;
-	private BigDecimal realDeliveryUpfloorFee;
-	private BigDecimal realDeliveryMoveFee;
-	private BigDecimal realDeliveryDistance;
-	private BigDecimal realDeliveryCrossingFee;
 	private BigDecimal realInstallFee;
 	private BigDecimal realQuotationFee;
 	private BigDecimal realClaimingValue;
@@ -165,4 +134,6 @@ public class StatisticsPackageInfoEntity extends TenantEntity {
 	private Integer goodsType; //1 订制品  2零担  3库存品
 	private String typeService; //1 商配  2市配  3自提  4三方中转
 
+	private Long orderInfoId;
+
 }

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java

@@ -0,0 +1,130 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("logpm_statistics_warehouse_package")
+@ApiModel(value = "StatisticsWarehousePackage对象", description = "结算仓库包件明细表")
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsWarehousePackageEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	/**
+	 * 运单id
+	 */
+	@ApiModelProperty(value = "运单id")
+	private Long waybillId;
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
+
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String orderPackageCode;
+
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类名称")
+	private String productName;
+
+	/**
+	 * 件数
+	 */
+	@ApiModelProperty(value = "件数")
+	private Integer totalNum;
+
+	/**
+	 * 重量
+	 */
+	@ApiModelProperty(value = "重量")
+	private BigDecimal totalWeight;
+
+	@ApiModelProperty(value = "体积")
+	private BigDecimal totalVolume;
+
+	private BigDecimal openPrice;
+	private BigDecimal totalPrice;
+	private Date incomingTime;
+	private Date outingTime;
+	private String warehouseFeeInterval;
+	private BigDecimal warehouseServiceFee;
+	private BigDecimal warehouseFee;
+	private BigDecimal warehouseManageFee;
+	private BigDecimal warehouseSortingFee;
+	private BigDecimal warehouseOperatingFee;
+	private Integer isAftersales;
+	private BigDecimal aftersalesPrice;
+	private Integer hasStatement;
+	private Long statementCreateTime;
+	private String statementCreateUser;
+	private Integer isZero;
+	private String realWarehouseFeeInterval;
+	private BigDecimal realWarehouseServiceFee;
+	private BigDecimal realWarehouseFee;
+	private BigDecimal realWarehouseManageFee;
+	private BigDecimal realWarehouseSortingFee;
+	private BigDecimal realWarehouseOperatingFee;
+
+	private Integer goodsType; //1 订制品  2零担  3库存品
+	private String typeService; //1 商配  2市配  3自提  4三方中转
+
+	private Long orderInfoId;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWaybillInfoEntity.java

@@ -0,0 +1,48 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_statistics_waybill_info")
+@ApiModel(value = "StatisticsWaybillInfo对象", description = "结算运单明细表")
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsWaybillInfoEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	private Long waybillId;
+	private String waybillNo;
+	private String typeService;
+
+	private Integer confirmStatisticsOrder;//0未确认 1部分确认 2已确认
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsWaybillInfoVO.java

@@ -0,0 +1,117 @@
+package com.logpm.statistics.vo;
+
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class StatisticsWaybillInfoVO extends StatisticsWaybillInfoEntity {
+
+	private String brand;
+	private String orderNo;
+	private String shipper;
+	private String shipperPerson;
+	private String shipperMobile;
+	private String shipperAddress;
+	private String consignee;
+	private String consigneePerson;
+	private String consigneeMobile;
+	private String consigneeAddress;
+	private String departure;
+	private String destination;
+	private String departureWarehouseName;
+	private String destinationWarehouseName;
+	private String deliveryMethod;
+	private String customerTrain;
+	private String receiptStatus;
+	private String waybillRemark;
+	private String statisticsFang;
+	private String payType;
+	private String payWay;
+	private String isAftersales;
+	private BigDecimal aftersalesFee;
+	private BigDecimal totalStatementFee;
+	private String statementStatus;
+	private BigDecimal hasStatementFee;
+	private String statementCreateUser;
+	private Integer isChanges;
+	private BigDecimal changesFee;
+	private String changesItems;
+	private String changesRemark;
+	private String changesTime;//最晚一条
+	private Integer signNum;
+	private Date signTime;//最晚一条
+	private String statisticsStatus;//结算状态
+//	private String statisticsStatus;//结算状态
+
+	private String storeBusiness;
+	private String waybillStatus;
+	private Integer isEdit;
+	private Integer isCheck;
+	private Date openTime;
+	private String goodsName;
+	private String goodsTypeNum;
+	private Integer productTypeNum;
+	private Integer totalcount;
+	private BigDecimal totalWeight;
+	private BigDecimal totalVolume;
+	private BigDecimal totalFee;
+	private BigDecimal openFee;
+	private BigDecimal pickupFee;
+	private BigDecimal realPickupFee;
+	private BigDecimal freightFee;
+	private BigDecimal realFreightFee;
+	private BigDecimal installFee;
+	private BigDecimal realInstallFee;
+	private BigDecimal quotationFee;
+	private BigDecimal realQuotationFee;
+	private BigDecimal claimingValue;
+	private BigDecimal realClaimingValue;
+	private BigDecimal otherFee;
+	private BigDecimal realOtherFee;
+	private BigDecimal returnFee;
+	private BigDecimal realReturnFee;
+	private BigDecimal thirdOprationFee;
+	private BigDecimal realThirdOprationFee;
+	private BigDecimal xPay;
+	private BigDecimal realXPay;
+	private BigDecimal dPay;
+	private BigDecimal realDPay;
+	private BigDecimal hPay;
+	private BigDecimal realHPay;
+	private BigDecimal yPay;
+	private BigDecimal realYPay;
+	private Date incomingTime;
+	private Date outingTime;
+	private String warehouseFeeInterval;
+	private BigDecimal warehouseServiceFee;
+	private BigDecimal realWarehouseServiceFee;
+	private BigDecimal warehouseFee;
+	private BigDecimal realWarehouseFee;
+	private BigDecimal warehouseManageFee;
+	private BigDecimal realWarehouseManageFee;
+	private BigDecimal warehouseSortingFee;
+	private BigDecimal realWarehouseSortingFee;
+	private BigDecimal warehouseOperatingFee;
+	private BigDecimal realWarehouseOperatingFee;
+	private BigDecimal deliveryServiceFee;
+	private BigDecimal realDeliveryServiceFee;
+	private BigDecimal deliveryFee;
+	private BigDecimal realDeliveryFee;
+	private BigDecimal deliveryLoadingFee;
+	private BigDecimal realDeliveryLoadingFee;
+	private BigDecimal deliverySortingFee;
+	private BigDecimal realDeliverySortingFee;
+	private BigDecimal deliveryUpfloorFee;
+	private BigDecimal realDeliveryUpfloorFee;
+	private BigDecimal deliveryMoveFee;
+	private BigDecimal realDeliveryMoveFee;
+	private BigDecimal deliveryDistance;
+	private BigDecimal realDeliveryDistance;
+	private BigDecimal deliveryCrossingFee;
+	private BigDecimal realDeliveryCrossingFee;
+
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceDetailVO.java

@@ -12,5 +12,6 @@ public class TrunklineAdvanceDetailVO extends TrunklineAdvanceDetailEntity {
 	private String trayName;
 
 	private String goodsName;
+	private Long goodsId;
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java

@@ -0,0 +1,48 @@
+package com.logpm.statistics.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.dto.MerchantStatisticsDTO;
+import com.logpm.statistics.service.IStatisticsOrderInfoService;
+import com.logpm.statistics.service.IStatisticsWaybillInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/merchantStatistics")
+@Api(value = "商户结算控制类", tags = "珊瑚结算接口")
+public class MerchantStatisticsController {
+
+	private final IStatisticsOrderInfoService statisticsOrderInfoService;
+	private final IStatisticsWaybillInfoService statisticsWaybillInfoService;
+
+	@ResponseBody
+	@PostMapping("/pageToBussesList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "运单维度对账单", notes = "传入waybillDTO")
+	public R pageToBussesList(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO) {
+		String method = "############pageToBussesList: ";
+		log.info(method+"请求参数{}",merchantStatisticsDTO);
+		try{
+
+//			IPage<TrunklineBillladingVO> pages = statisticsWaybillInfoService.pageToBussesList(merchantStatisticsDTO);
+//
+//			return R.data(pages);
+			return R.data(null);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java

@@ -0,0 +1,114 @@
+package com.logpm.statistics.listener.mq;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import com.logpm.statistics.service.IStatisticsDistributionPackageService;
+import com.logpm.statistics.service.IStatisticsOrderInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.WorkNodeEnums;
+import org.springblade.common.constant.broadcast.FanoutConstants;
+import org.springframework.amqp.core.ExchangeTypes;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class PackageFanoutListener {
+
+	private final IStatisticsDistributionPackageService statisticsDistributionPackageService;
+	private final IStatisticsOrderInfoService statisticsOrderInfoService;
+
+	@RabbitListener(bindings = @QueueBinding(
+		value = @Queue(name = FanoutConstants.trunkline.PACKAGNODE.QUEUE.PACKAGE_SIGN),
+		exchange = @Exchange(name = FanoutConstants.trunkline.PACKAGNODE.EXCHANGE, type = ExchangeTypes.FANOUT)
+	))
+	@Transactional(rollbackFor = Exception.class)
+	public void packageSignFanout(String msg) {
+		JSONObject jsonObject = JSONUtil.parseObj(msg);
+		Integer workNode = jsonObject.getInt("workNode");
+		if(WorkNodeEnums.SIGN_DIRECT_SHIPPER.getCode().equals(workNode)
+			|| WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode().equals(workNode)
+			|| WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode().equals(workNode)){
+
+			JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
+			List<String> orderPackageCodeList = orderPackageCodes.toList(String.class);
+
+			//如果是签收
+			List<StatisticsDistributionPackageEntity> statisticsDistributionList = statisticsDistributionPackageService.findListByOrderPackageCodes(orderPackageCodeList);
+			//修改statisticsDistributionList中所有元素的isSign为1
+			Set<Long> orderInfoSet = new HashSet<>();
+			statisticsDistributionList.forEach(statisticsDistributionPackageEntity -> {
+				statisticsDistributionPackageEntity.setIsSign(1);
+				String typeService = statisticsDistributionPackageEntity.getTypeService();
+				if("3".equals(typeService)){
+					statisticsDistributionPackageEntity.setRealDeliveryFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryDistance(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryCrossingFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryLoadingFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryMoveFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryServiceFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliverySortingFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryUpfloorFee(BigDecimal.ZERO);
+				}
+				orderInfoSet.add(statisticsDistributionPackageEntity.getOrderInfoId());
+			});
+			statisticsDistributionPackageService.updateBatchById(statisticsDistributionList);
+
+			List<StatisticsDistributionPackageEntity> statisticsList = statisticsDistributionPackageService.findListByOrderInfoSet(orderInfoSet);
+			//把statisticsList通过元素的orderInfoId进行map分组
+			Map<Long, List<StatisticsDistributionPackageEntity>> groupedStatisticsList = statisticsList.stream()
+				.collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getOrderInfoId));
+
+			List<StatisticsOrderInfoEntity> orderInfoList = statisticsOrderInfoService.findListByOrderInfoIdsSet(orderInfoSet);
+			//把orderInfoList转成以id为key的map
+			Map<Long, StatisticsOrderInfoEntity> orderInfoMap = orderInfoList.stream()
+				.collect(Collectors.toMap(StatisticsOrderInfoEntity::getId, statisticsOrderInfoEntity -> statisticsOrderInfoEntity));
+
+			List<StatisticsOrderInfoEntity> updateOrderInfoList = new ArrayList<>();
+			groupedStatisticsList.keySet().forEach(orderInfoId -> {
+				StatisticsOrderInfoEntity statisticsOrderInfoEntity = orderInfoMap.get(orderInfoId);
+				Integer signStatus = statisticsOrderInfoEntity.getSignStatus();
+				List<StatisticsDistributionPackageEntity> statisticsDistributionPackageEntities = groupedStatisticsList.get(orderInfoId);
+				int allSize = statisticsDistributionPackageEntities.size();
+
+				//过滤出statisticsDistributionPackageEntities中isSign等于0的元素
+				List<StatisticsDistributionPackageEntity> unSignStatisticsDistributionPackageEntities = statisticsDistributionPackageEntities.stream()
+					.filter(statisticsDistributionPackageEntity -> !statisticsDistributionPackageEntity.getIsSign().equals(1))
+					.collect(Collectors.toList());
+
+				int unSignSize = unSignStatisticsDistributionPackageEntities.size();
+
+				if(unSignSize == 0){
+					if(signStatus != 2){
+						statisticsOrderInfoEntity.setSignStatus(2);
+					}
+				}else{
+					if(unSignSize != allSize){
+						if(signStatus != 1){
+							statisticsOrderInfoEntity.setSignStatus(1);
+						}
+					}
+				}
+				updateOrderInfoList.add(statisticsOrderInfoEntity);
+			});
+
+			statisticsOrderInfoService.updateBatchById(updateOrderInfoList);
+
+		}
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java

@@ -3,8 +3,8 @@ package com.logpm.statistics.listener.mq;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import com.logpm.statistics.service.IStatisticsPackageInfoService;
+import com.logpm.statistics.entity.*;
+import com.logpm.statistics.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.broadcast.FanoutConstants;
@@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -25,7 +27,11 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class WaybillFanoutListener {
 
-	private final IStatisticsPackageInfoService statisticsPackageInfoService;
+	private final IStatisticsTrunklinePackageService statisticsTrunklinePackageService;
+	private final IStatisticsWarehousePackageService statisticsWarehousePackageService;
+	private final IStatisticsDistributionPackageService statisticsDistributionPackageService;
+	private final IStatisticsOrderInfoService statisticsOrderInfoService;
+	private final IStatisticsWaybillInfoService statisticsWaybillInfoService;
 
 	@RabbitListener(bindings = @QueueBinding(
 		value = @Queue(name = FanoutConstants.trunkline.OPENWAYBILL.QUEUE.STATISTICSDATA_CREATEPACKAGEINFO),
@@ -34,113 +40,216 @@ public class WaybillFanoutListener {
 	@Transactional(rollbackFor = Exception.class)
 	public void createPackageInfo(String msg) {
 
-//		if(StringUtil.isBlank(msg)){
-//			log.warn("############createPackageInfo: 接收参数为空 msg={}",msg);
-//
-//		}
-
 		JSONObject jsonObject = JSONUtil.parseObj(msg);
 		Long warehouseId = jsonObject.getLong("warehouseId");
 		String warehouseName = jsonObject.getStr("warehouseName");
 		Long waybillId = jsonObject.getLong("waybillId");
 		String waybillNo = jsonObject.getStr("waybillNo");
+		String typeService = jsonObject.getStr("typeService");//服务类型
+
+		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntities = new ArrayList<>();
+		List<StatisticsWarehousePackageEntity> statisticsWarehousePackageEntities = new ArrayList<>();
+		List<StatisticsDistributionPackageEntity> statisticsDistributionPackageEntities = new ArrayList<>();
 
-		List<StatisticsPackageInfoEntity> ls = new ArrayList<>();
 		JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
 		for (int i = 0; i < orderPackageCodes.size(); i++) {
 			JSONObject json = orderPackageCodes.getJSONObject(i);
-			StatisticsPackageInfoEntity statisticsPackageInfoEntity = new StatisticsPackageInfoEntity();
-			statisticsPackageInfoEntity.setWarehouseId(warehouseId);
-			statisticsPackageInfoEntity.setWarehouseName(warehouseName);
-			statisticsPackageInfoEntity.setTypeService(json.getStr("typeService"));
-			statisticsPackageInfoEntity.setWaybillId(waybillId);
-			statisticsPackageInfoEntity.setWaybillNo(waybillNo);
+
+			//干线
+			StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity();
+			statisticsTrunklinePackageEntity.setWarehouseId(warehouseId);
+			statisticsTrunklinePackageEntity.setWarehouseName(warehouseName);
+			statisticsTrunklinePackageEntity.setTypeService(typeService);
+			statisticsTrunklinePackageEntity.setWaybillId(waybillId);
+			statisticsTrunklinePackageEntity.setWaybillNo(waybillNo);
 			Integer waybillType = json.getInt("waybillType");
 			if(waybillType.equals(1)){
-				statisticsPackageInfoEntity.setGoodsType(1);
+				statisticsTrunklinePackageEntity.setGoodsType(1);
+			}else if (waybillType.equals(2)){
+				statisticsTrunklinePackageEntity.setGoodsType(2);
+			}else{
+				statisticsTrunklinePackageEntity.setGoodsType(3);
+			}
+			statisticsTrunklinePackageEntity.setOrderCode(json.getStr("orderCode"));
+			statisticsTrunklinePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsTrunklinePackageEntity.setProductName(json.getStr("productName"));
+			statisticsTrunklinePackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsTrunklinePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsTrunklinePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsTrunklinePackageEntity.setOpenPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setTotalPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setRealPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setRealFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setRealInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setRealQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setRealClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setRealOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setRealReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setRealThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setRealXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setRealDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setRealHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntity.setRealYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntities.add(statisticsTrunklinePackageEntity);
+
+			//仓库
+			StatisticsWarehousePackageEntity statisticsWarehousePackageEntity = new StatisticsWarehousePackageEntity();
+			statisticsWarehousePackageEntity.setWarehouseId(warehouseId);
+			statisticsWarehousePackageEntity.setWarehouseName(warehouseName);
+			statisticsWarehousePackageEntity.setTypeService(typeService);
+			statisticsWarehousePackageEntity.setWaybillId(waybillId);
+			statisticsWarehousePackageEntity.setWaybillNo(waybillNo);
+			if(waybillType.equals(1)){
+				statisticsWarehousePackageEntity.setGoodsType(1);
+			}else if (waybillType.equals(2)){
+				statisticsWarehousePackageEntity.setGoodsType(2);
+			}else{
+				statisticsWarehousePackageEntity.setGoodsType(3);
+			}
+			statisticsWarehousePackageEntity.setOrderCode(json.getStr("orderCode"));
+			statisticsWarehousePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsWarehousePackageEntity.setProductName(json.getStr("productName"));
+			statisticsWarehousePackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsWarehousePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsWarehousePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsWarehousePackageEntity.setWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
+			statisticsWarehousePackageEntity.setWarehouseFee(json.getBigDecimal("warehouseFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseFee(json.getBigDecimal("warehouseFee"));
+			statisticsWarehousePackageEntity.setWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
+			statisticsWarehousePackageEntity.setWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
+			statisticsWarehousePackageEntity.setWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
+			statisticsWarehousePackageEntities.add(statisticsWarehousePackageEntity);
+
+
+			//配送
+			StatisticsDistributionPackageEntity statisticsDistributionPackageEntity = new StatisticsDistributionPackageEntity();
+			statisticsDistributionPackageEntity.setWarehouseId(warehouseId);
+			statisticsDistributionPackageEntity.setWarehouseName(warehouseName);
+			statisticsDistributionPackageEntity.setTypeService(typeService);
+			statisticsDistributionPackageEntity.setWaybillId(waybillId);
+			statisticsDistributionPackageEntity.setWaybillNo(waybillNo);
+			if(waybillType.equals(1)){
+				statisticsDistributionPackageEntity.setGoodsType(1);
 			}else if (waybillType.equals(2)){
-				statisticsPackageInfoEntity.setGoodsType(2);
+				statisticsDistributionPackageEntity.setGoodsType(2);
 			}else{
-				statisticsPackageInfoEntity.setGoodsType(3);
+				statisticsDistributionPackageEntity.setGoodsType(3);
 			}
-			statisticsPackageInfoEntity.setOrderCode(json.getStr("orderCode"));
-			statisticsPackageInfoEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
-			statisticsPackageInfoEntity.setProductName(json.getStr("productName"));
-			statisticsPackageInfoEntity.setTotalNum(json.getInt("totalNum"));
-			statisticsPackageInfoEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
-			statisticsPackageInfoEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
-			statisticsPackageInfoEntity.setOpenPrice(json.getBigDecimal("openPrice"));
-			statisticsPackageInfoEntity.setTotalPrice(json.getBigDecimal("openPrice"));
-			statisticsPackageInfoEntity.setPickupFee(json.getBigDecimal("pickupFee"));
-			statisticsPackageInfoEntity.setRealPickupFee(json.getBigDecimal("pickupFee"));
-			statisticsPackageInfoEntity.setFreightFee(json.getBigDecimal("freightFee"));
-			statisticsPackageInfoEntity.setRealFreightFee(json.getBigDecimal("freightFee"));
-			statisticsPackageInfoEntity.setWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
-			statisticsPackageInfoEntity.setRealWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
-			statisticsPackageInfoEntity.setWarehouseFee(json.getBigDecimal("warehouseFee"));
-			statisticsPackageInfoEntity.setRealWarehouseFee(json.getBigDecimal("warehouseFee"));
-			statisticsPackageInfoEntity.setWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
-			statisticsPackageInfoEntity.setRealWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
-			statisticsPackageInfoEntity.setWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
-			statisticsPackageInfoEntity.setRealWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
-			statisticsPackageInfoEntity.setWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
-			statisticsPackageInfoEntity.setRealWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
-			statisticsPackageInfoEntity.setDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
-			statisticsPackageInfoEntity.setRealDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
-			statisticsPackageInfoEntity.setDeliveryFee(json.getBigDecimal("deliveryFee"));
-			statisticsPackageInfoEntity.setRealDeliveryFee(json.getBigDecimal("deliveryFee"));
-			statisticsPackageInfoEntity.setDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
-			statisticsPackageInfoEntity.setRealDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
-			statisticsPackageInfoEntity.setDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
-			statisticsPackageInfoEntity.setRealDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
-			statisticsPackageInfoEntity.setDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
-			statisticsPackageInfoEntity.setRealDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
-			statisticsPackageInfoEntity.setDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
-			statisticsPackageInfoEntity.setRealDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
-			statisticsPackageInfoEntity.setDeliveryDistance(json.getBigDecimal("deliveryDistance"));
-			statisticsPackageInfoEntity.setRealDeliveryDistance(json.getBigDecimal("deliveryDistance"));
-			statisticsPackageInfoEntity.setDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
-			statisticsPackageInfoEntity.setRealDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
-			statisticsPackageInfoEntity.setInstallFee(json.getBigDecimal("installFee"));
-			statisticsPackageInfoEntity.setRealInstallFee(json.getBigDecimal("installFee"));
-			statisticsPackageInfoEntity.setQuotationFee(json.getBigDecimal("quotationFee"));
-			statisticsPackageInfoEntity.setRealQuotationFee(json.getBigDecimal("quotationFee"));
-			statisticsPackageInfoEntity.setClaimingValue(json.getBigDecimal("claimingValue"));
-			statisticsPackageInfoEntity.setRealClaimingValue(json.getBigDecimal("claimingValue"));
-			statisticsPackageInfoEntity.setOtherFee(json.getBigDecimal("otherFee"));
-			statisticsPackageInfoEntity.setRealOtherFee(json.getBigDecimal("otherFee"));
-			statisticsPackageInfoEntity.setReturnFee(json.getBigDecimal("returnFee"));
-			statisticsPackageInfoEntity.setRealReturnFee(json.getBigDecimal("returnFee"));
-			statisticsPackageInfoEntity.setThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
-			statisticsPackageInfoEntity.setRealThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
-			statisticsPackageInfoEntity.setXPay(json.getBigDecimal("xPay"));
-			statisticsPackageInfoEntity.setRealXPay(json.getBigDecimal("xPay"));
-			statisticsPackageInfoEntity.setDPay(json.getBigDecimal("dPay"));
-			statisticsPackageInfoEntity.setRealDPay(json.getBigDecimal("dPay"));
-			statisticsPackageInfoEntity.setHPay(json.getBigDecimal("hPay"));
-			statisticsPackageInfoEntity.setRealHPay(json.getBigDecimal("hPay"));
-			statisticsPackageInfoEntity.setYPay(json.getBigDecimal("yPay"));
-			statisticsPackageInfoEntity.setRealYPay(json.getBigDecimal("yPay"));
-			statisticsPackageInfoEntity.setIsAftersales(0);
-			statisticsPackageInfoEntity.setHasStatement(0);
-			ls.add(statisticsPackageInfoEntity);
+			statisticsDistributionPackageEntity.setOrderCode(json.getStr("orderCode"));
+			statisticsDistributionPackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsDistributionPackageEntity.setProductName(json.getStr("productName"));
+			statisticsDistributionPackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsDistributionPackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsDistributionPackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsDistributionPackageEntity.setDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
+			statisticsDistributionPackageEntity.setDeliveryFee(json.getBigDecimal("deliveryFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryFee(json.getBigDecimal("deliveryFee"));
+			statisticsDistributionPackageEntity.setDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
+			statisticsDistributionPackageEntity.setDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
+			statisticsDistributionPackageEntity.setRealDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
+			statisticsDistributionPackageEntity.setDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
+			statisticsDistributionPackageEntity.setDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
+			statisticsDistributionPackageEntity.setDeliveryDistance(json.getBigDecimal("deliveryDistance"));
+			statisticsDistributionPackageEntity.setRealDeliveryDistance(json.getBigDecimal("deliveryDistance"));
+			statisticsDistributionPackageEntity.setDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
+			statisticsDistributionPackageEntities.add(statisticsDistributionPackageEntity);
+
+		}
+
+		Long waybillInfoId = null;
+		//生成运单维度
+		if(!"2".equals(typeService)){
+			StatisticsWaybillInfoEntity statisticsWaybillInfoEntity = new StatisticsWaybillInfoEntity();
+			statisticsWaybillInfoEntity.setWaybillNo(waybillNo);
+			statisticsWaybillInfoEntity.setWaybillId(waybillId);
+			statisticsWaybillInfoEntity.setTypeService(typeService);
+			statisticsWaybillInfoEntity.setConfirmStatisticsOrder(0);
+			statisticsWaybillInfoService.save(statisticsWaybillInfoEntity);
+			waybillInfoId = statisticsWaybillInfoEntity.getId();
 		}
-		statisticsPackageInfoService.saveBatch(ls);
 
 
-		//把ls通过typeService=2过滤为一个新的list
-		List<StatisticsPackageInfoEntity> shipeiList = ls.stream().filter(item -> item.getTypeService().equals("2")).collect(Collectors.toList());
-		//toC维度
+		//把statisticsPackageInfoEntities的orderCode作为key进行分组
+		Map<String, List<StatisticsTrunklinePackageEntity>> trunklineMap = statisticsTrunklinePackageEntities.stream().collect(Collectors.groupingBy(StatisticsTrunklinePackageEntity::getOrderCode));
+		Map<String, List<StatisticsWarehousePackageEntity>> warehouseMap = statisticsWarehousePackageEntities.stream().collect(Collectors.groupingBy(StatisticsWarehousePackageEntity::getOrderCode));
+		Map<String, List<StatisticsDistributionPackageEntity>> distributionMap = statisticsDistributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getOrderCode));
+		List<StatisticsOrderInfoEntity> orderInfoEntities = new ArrayList<>();
+		Long finalWaybillInfoId = waybillInfoId;
+		trunklineMap.keySet().forEach(key -> {
 
+			StatisticsOrderInfoEntity statisticsOrderInfoEntity = new StatisticsOrderInfoEntity();
+			statisticsOrderInfoEntity.setWaybillId(waybillId);
+			statisticsOrderInfoEntity.setWaybillNo(waybillNo);
+			statisticsOrderInfoEntity.setOrderCode(key);
+			statisticsOrderInfoEntity.setTypeService(typeService);
+			if(!Objects.isNull(finalWaybillInfoId)){
+				statisticsOrderInfoEntity.setWaybillInfoId(finalWaybillInfoId);
+			}
 
+//			statisticsOrderInfoEntity.setConfirmStatus(0);
+			orderInfoEntities.add(statisticsOrderInfoEntity);
+		});
 
+		statisticsOrderInfoService.saveBatch(orderInfoEntities);
 
-		List<StatisticsPackageInfoEntity> otherList = ls.stream().filter(item -> !item.getTypeService().equals("2")).collect(Collectors.toList());
-		//toB维度
+		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageSaveList = new ArrayList<>();
+		List<StatisticsWarehousePackageEntity> statisticsWarehousePackageSaveList = new ArrayList<>();
+		List<StatisticsDistributionPackageEntity> statisticsDistributionPackageSaveList = new ArrayList<>();
+		orderInfoEntities.forEach(statisticsOrderInfoEntity -> {
+			String orderCode = statisticsOrderInfoEntity.getOrderCode();
+			Long orderInfoId = statisticsOrderInfoEntity.getId();
+			List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntityList= trunklineMap.get(orderCode);
+			statisticsTrunklinePackageEntityList.forEach(statisticsTrunklinePackageEntity -> {
+				statisticsTrunklinePackageEntity.setOrderInfoId(orderInfoId);
+			});
+			statisticsTrunklinePackageSaveList.addAll(statisticsTrunklinePackageEntityList);
+		});
+		statisticsTrunklinePackageService.saveBatch(statisticsTrunklinePackageSaveList);
 
+		orderInfoEntities.forEach(statisticsOrderInfoEntity -> {
+			String orderCode = statisticsOrderInfoEntity.getOrderCode();
+			Long orderInfoId = statisticsOrderInfoEntity.getId();
+			List<StatisticsWarehousePackageEntity> statisticsWarehousePackageEntityList= warehouseMap.get(orderCode);
+			statisticsWarehousePackageEntityList.forEach(statisticsWarehousePackageEntity -> {
+				statisticsWarehousePackageEntity.setOrderInfoId(orderInfoId);
+			});
+			statisticsWarehousePackageSaveList.addAll(statisticsWarehousePackageEntityList);
+		});
 
+		statisticsWarehousePackageService.saveBatch(statisticsWarehousePackageSaveList);
 
+		orderInfoEntities.forEach(statisticsOrderInfoEntity -> {
+			String orderCode = statisticsOrderInfoEntity.getOrderCode();
+			Long orderInfoId = statisticsOrderInfoEntity.getId();
+			List<StatisticsDistributionPackageEntity> statisticsDistributionPackageEntityList= distributionMap.get(orderCode);
+			statisticsDistributionPackageEntityList.forEach(statisticsDistributionPackageEntity -> {
+				statisticsDistributionPackageEntity.setOrderInfoId(orderInfoId);
+			});
+			statisticsDistributionPackageSaveList.addAll(statisticsDistributionPackageEntityList);
+		});
 
+		statisticsDistributionPackageService.saveBatch(statisticsDistributionPackageSaveList);
 
 
 		log.info("处理完成：{}", msg);
@@ -155,6 +264,84 @@ public class WaybillFanoutListener {
 	@Transactional(rollbackFor = Exception.class)
 	public void updateWaybillData(String msg) {
 		log.info("接收到消息：{}", msg);
+
+		JSONObject jsonObject = JSONUtil.parseObj(msg);
+		Long warehouseId = jsonObject.getLong("warehouseId");
+		String warehouseName = jsonObject.getStr("warehouseName");
+		Long waybillId = jsonObject.getLong("waybillId");
+		String waybillNo = jsonObject.getStr("waybillNo");
+		String typeService = jsonObject.getStr("typeService");//服务类型
+
+		statisticsTrunklinePackageService.deleteListByWaybillId(waybillId);
+
+		List<StatisticsOrderInfoEntity> orderInfoEntities = statisticsOrderInfoService.findListByWaybillId(waybillId);
+		//把orderInfoEntities以orderCode未key,元素本身为value转成Map
+		Map<String, StatisticsOrderInfoEntity> orderInfoMap = orderInfoEntities.stream()
+			.collect(Collectors.toMap(
+				StatisticsOrderInfoEntity::getOrderCode,
+				entity -> entity
+			));
+		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntities = new ArrayList<>();
+
+		JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
+		for (int i = 0; i < orderPackageCodes.size(); i++) {
+			JSONObject json = orderPackageCodes.getJSONObject(i);
+
+			//干线
+			StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity();
+			statisticsTrunklinePackageEntity.setWarehouseId(warehouseId);
+			statisticsTrunklinePackageEntity.setWarehouseName(warehouseName);
+			statisticsTrunklinePackageEntity.setTypeService(typeService);
+			statisticsTrunklinePackageEntity.setWaybillId(waybillId);
+			statisticsTrunklinePackageEntity.setWaybillNo(waybillNo);
+			Integer waybillType = json.getInt("waybillType");
+			if(waybillType.equals(1)){
+				statisticsTrunklinePackageEntity.setGoodsType(1);
+			}else if (waybillType.equals(2)){
+				statisticsTrunklinePackageEntity.setGoodsType(2);
+			}else{
+				statisticsTrunklinePackageEntity.setGoodsType(3);
+			}
+			String orderCode = json.getStr("orderCode");
+			StatisticsOrderInfoEntity statisticsOrderInfoEntity = orderInfoMap.get(orderCode);
+			statisticsTrunklinePackageEntity.setOrderInfoId(statisticsOrderInfoEntity.getId());
+			statisticsTrunklinePackageEntity.setOrderCode(orderCode);
+			statisticsTrunklinePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsTrunklinePackageEntity.setProductName(json.getStr("productName"));
+			statisticsTrunklinePackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsTrunklinePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsTrunklinePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsTrunklinePackageEntity.setOpenPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setTotalPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setRealPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setRealFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setRealInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setRealQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setRealClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setRealOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setRealReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setRealThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setRealXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setRealDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setRealHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntity.setRealYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntities.add(statisticsTrunklinePackageEntity);
+
+		}
+		statisticsTrunklinePackageService.saveBatch(statisticsTrunklinePackageEntities);
+
 	}
 
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsDistributionPackageMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsDistributionPackageMapper extends BaseMapper<StatisticsDistributionPackageEntity> {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsOrderInfoMapper extends BaseMapper<StatisticsOrderInfoEntity> {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsPackageInfoMapper.java

@@ -1,9 +0,0 @@
-package com.logpm.statistics.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface StatisticsPackageInfoMapper extends BaseMapper<StatisticsPackageInfoEntity> {
-}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsPackageInfoMapper.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.logpm.statistics.mapper.StatisticsPackageInfoMapper">
-
-
-</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsTrunklinePackageMapper.java

@@ -0,0 +1,11 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsTrunklinePackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface StatisticsTrunklinePackageMapper extends BaseMapper<StatisticsTrunklinePackageEntity> {
+	void deleteListByWaybillId(@Param("waybillId") Long waybillId);
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsTrunklinePackageMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.StatisticsTrunklinePackageMapper">
+
+    <delete id="deleteListByWaybillId" >
+        delete from logpm_statistics_trunkline_package
+        where waybill_id = #{waybillId}
+    </delete>
+
+</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsWarehousePackageMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsWarehousePackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsWarehousePackageMapper extends BaseMapper<StatisticsWarehousePackageEntity> {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsWaybillInfoMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsWaybillInfoMapper extends BaseMapper<StatisticsWaybillInfoEntity> {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsDistributionPackageService.java

@@ -0,0 +1,13 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Set;
+
+public interface IStatisticsDistributionPackageService extends BaseService<StatisticsDistributionPackageEntity> {
+    List<StatisticsDistributionPackageEntity> findListByOrderPackageCodes(List<String> orderPackageCodeList);
+
+	List<StatisticsDistributionPackageEntity> findListByOrderInfoSet(Set<Long> orderInfoSet);
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java

@@ -0,0 +1,13 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Set;
+
+public interface IStatisticsOrderInfoService extends BaseService<StatisticsOrderInfoEntity> {
+    List<StatisticsOrderInfoEntity> findListByWaybillId(Long waybillId);
+
+    List<StatisticsOrderInfoEntity> findListByOrderInfoIdsSet(Set<Long> orderInfoSet);
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsPackageInfoService.java

@@ -1,7 +0,0 @@
-package com.logpm.statistics.service;
-
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import org.springblade.core.mp.base.BaseService;
-
-public interface IStatisticsPackageInfoService extends BaseService<StatisticsPackageInfoEntity> {
-}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsTrunklinePackageService.java

@@ -0,0 +1,8 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsTrunklinePackageEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IStatisticsTrunklinePackageService extends BaseService<StatisticsTrunklinePackageEntity> {
+	void deleteListByWaybillId(Long waybillId);
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsWarehousePackageService.java

@@ -0,0 +1,7 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsWarehousePackageEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IStatisticsWarehousePackageService extends BaseService<StatisticsWarehousePackageEntity> {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsWaybillInfoService.java

@@ -0,0 +1,7 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IStatisticsWaybillInfoService extends BaseService<StatisticsWaybillInfoEntity> {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsDistributionPackageServiceImpl.java

@@ -0,0 +1,34 @@
+package com.logpm.statistics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import com.logpm.statistics.mapper.StatisticsDistributionPackageMapper;
+import com.logpm.statistics.service.IStatisticsDistributionPackageService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsDistributionPackageServiceImpl extends BaseServiceImpl<StatisticsDistributionPackageMapper,StatisticsDistributionPackageEntity> implements IStatisticsDistributionPackageService {
+	@Override
+	public List<StatisticsDistributionPackageEntity> findListByOrderPackageCodes(List<String> orderPackageCodeList) {
+		QueryWrapper<StatisticsDistributionPackageEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("order_package_code", orderPackageCodeList);
+
+		return baseMapper.selectList(queryWrapper);
+	}
+
+	@Override
+	public List<StatisticsDistributionPackageEntity> findListByOrderInfoSet(Set<Long> orderInfoSet) {
+		QueryWrapper<StatisticsDistributionPackageEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("order_info_id", orderInfoSet);
+
+		return baseMapper.selectList(queryWrapper);
+	}
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -0,0 +1,32 @@
+package com.logpm.statistics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import com.logpm.statistics.mapper.StatisticsOrderInfoMapper;
+import com.logpm.statistics.service.IStatisticsOrderInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOrderInfoMapper, StatisticsOrderInfoEntity> implements IStatisticsOrderInfoService {
+	@Override
+	public List<StatisticsOrderInfoEntity> findListByWaybillId(Long waybillId) {
+		QueryWrapper<StatisticsOrderInfoEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("waybill_id",waybillId);
+		return baseMapper.selectList(queryWrapper);
+	}
+
+	@Override
+	public List<StatisticsOrderInfoEntity> findListByOrderInfoIdsSet(Set<Long> orderInfoSet) {
+		QueryWrapper<StatisticsOrderInfoEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("id",orderInfoSet);
+		return baseMapper.selectList(queryWrapper);
+	}
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsPackageInfoServiceImpl.java

@@ -1,15 +0,0 @@
-package com.logpm.statistics.service.impl;
-
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import com.logpm.statistics.mapper.StatisticsPackageInfoMapper;
-import com.logpm.statistics.service.IStatisticsPackageInfoService;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-@Slf4j
-public class StatisticsPackageInfoServiceImpl extends BaseServiceImpl<StatisticsPackageInfoMapper, StatisticsPackageInfoEntity> implements IStatisticsPackageInfoService {
-}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsTrunklinePackageServiceImpl.java

@@ -0,0 +1,19 @@
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.StatisticsTrunklinePackageEntity;
+import com.logpm.statistics.mapper.StatisticsTrunklinePackageMapper;
+import com.logpm.statistics.service.IStatisticsTrunklinePackageService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class StatisticsTrunklinePackageServiceImpl extends BaseServiceImpl<StatisticsTrunklinePackageMapper, StatisticsTrunklinePackageEntity> implements IStatisticsTrunklinePackageService {
+	@Override
+	public void deleteListByWaybillId(Long waybillId) {
+		baseMapper.deleteListByWaybillId(waybillId);
+	}
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsWarehousePackageServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.StatisticsWarehousePackageEntity;
+import com.logpm.statistics.mapper.StatisticsWarehousePackageMapper;
+import com.logpm.statistics.service.IStatisticsWarehousePackageService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsWarehousePackageServiceImpl extends BaseServiceImpl<StatisticsWarehousePackageMapper,StatisticsWarehousePackageEntity> implements IStatisticsWarehousePackageService {
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsWaybillInfoServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import com.logpm.statistics.mapper.StatisticsWaybillInfoMapper;
+import com.logpm.statistics.service.IStatisticsWaybillInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsWaybillInfoServiceImpl extends BaseServiceImpl<StatisticsWaybillInfoMapper, StatisticsWaybillInfoEntity> implements IStatisticsWaybillInfoService {
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -358,7 +358,8 @@
     </select>
 
     <select id="findAdvanceDetailVoByAdvanceIds" resultType="com.logpm.trunkline.vo.TrunklineAdvanceDetailVO">
-        select IFNULL(lbc.name,'其他') goodsName,
+        select lbc.id goodsId,
+               IFNULL(lbc.name,'其他') goodsName,
                ltad.*
         from logpm_trunkline_advance_detail ltad
         left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -773,7 +773,7 @@
         select ltcls.*,
                ltco.sign_order_id signOrderId
         from logpm_trunkline_cars_load_scan ltcls
-        left join logpm_trunkline_cars_order ltco on ltco.waybill_id = ltcls.waybill_id and ltco.order_code = ltcls.order_code and ltcls.node_id = ltco.warehouse_id
+        left join logpm_trunkline_cars_order ltco on ltco.waybill_id = ltcls.waybill_id and ltco.order_code = ltcls.order_code and ltcls.warehouse_id = ltco.warehouse_id
         where ltcls.scan_status = '1'
         and ltcls.id in
         <foreach collection="carsLoadScanIds" item="item" separator="," open="(" close=")">

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java

@@ -24,4 +24,6 @@ public interface IOpenOrderAsyncService {
 	void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity);
 
     void sendOpenWaybillFanout(WarehouseWaybillEntity waybillEntity, List<WarehouseWayBillDetail> details, List<Long> advanceIds);
+
+    void sendUpdateWaybillFanout(WarehouseWaybillEntity waybillEntity, List<WarehouseWayBillDetail> details, List<Long> advanceIds);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IPackageTrackLogAsyncService.java

@@ -9,4 +9,7 @@ public interface IPackageTrackLogAsyncService {
 	void addPackageTrackLog(String tenantId, Long userId, Long deptId, String nickName, List<String> orderPackageCodes, Long warehouseId, String warehouseName, Integer workNode, String content);
 
 	void addBatchPackageTrackLog(List<WarehousePackageTrackLogEntity> addPackageTrackLogList, List<String> orderPackageCodes, Integer code);
+
+    void sendPackageWorkNodeFanout(List<String> orderPackageCodes,Integer workNodeV);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java

@@ -328,7 +328,7 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		jsonObject.put("waybillNo",waybillNo);
 		jsonObject.put("waybillType",waybillType);
 		Long consigneeId = waybillEntity.getConsigneeId();
-		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(consigneeId);
+		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
 		if(Objects.isNull(basicdataClientEntity)){
 			jsonObject.put("typeService","1");
 		}else{
@@ -387,14 +387,16 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 			List<JSONObject> jsonList = new ArrayList<>();
 			list.forEach(advanceDetailVO -> {
 				JSONObject json = new JSONObject();
+				String goodsName = advanceDetailVO.getGoodsName();
 				BigDecimal openPrice = BigDecimal.ZERO;
 				json.put("orderPackageCode",advanceDetailVO.getOrderPackageCode());
 				json.put("orderCode",advanceDetailVO.getOrderCode());
-				json.put("productName",advanceDetailVO.getFirstPackName());
+				json.put("productId",advanceDetailVO.getGoodsId());
+				json.put("productName",goodsName);
 				json.put("totalNum",advanceDetailVO.getQuantity());
 				json.put("totalWeight",advanceDetailVO.getWeight());
 				json.put("totalVolume",advanceDetailVO.getVolume());
-				String goodsName = advanceDetailVO.getGoodsName();
+
 				WarehouseWayBillDetail warehouseWayBillDetail = detailsMap.get(goodsName);
 				if(!Objects.isNull(warehouseWayBillDetail)){
 					Integer num = warehouseWayBillDetail.getNum();
@@ -537,4 +539,234 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		sendFanoutService.sendFanoutMsg(build);
 
 	}
+
+
+	@LogpmAsync("asyncExecutor")
+	@Override
+	public void sendUpdateWaybillFanout(WarehouseWaybillEntity waybillEntity, List<WarehouseWayBillDetail> details,List<Long> advanceIds) {
+
+		Integer waybillType = waybillEntity.getWaybillType();
+		String waybillNo = waybillEntity.getWaybillNo();
+
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("warehouseId",waybillEntity.getDepartureWarehouseId());
+		jsonObject.put("warehouseName",waybillEntity.getDepartureWarehouseName());
+		jsonObject.put("waybillId",waybillEntity.getId());
+		jsonObject.put("waybillNo",waybillNo);
+		jsonObject.put("waybillType",waybillType);
+		Long consigneeId = waybillEntity.getConsigneeId();
+		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
+		if(Objects.isNull(basicdataClientEntity)){
+			jsonObject.put("typeService","1");
+		}else{
+			BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3);
+			if(Objects.isNull(storeBusinessEntity)){
+				jsonObject.put("typeService","1");
+			}else{
+				jsonObject.put("typeService",storeBusinessEntity.getMold());
+			}
+		}
+
+
+		Integer totalCount = waybillEntity.getTotalCount();
+		BigDecimal pickupFee = waybillEntity.getPickupFee();
+		BigDecimal pickupPrice = pickupFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal installFee = waybillEntity.getInstallFee();
+		BigDecimal installPrice = installFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal insuranceFee = waybillEntity.getInsuranceFee();
+		BigDecimal insurancePrice = insuranceFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal claimingValue = waybillEntity.getClaimingValue();
+		BigDecimal claimingPrice = claimingValue.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal otherFee = waybillEntity.getOtherFee();
+		BigDecimal otherPrice = otherFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal rebate = waybillEntity.getRebate();
+		BigDecimal rebatePrice = rebate.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal thirdOperationFee = waybillEntity.getThirdOperationFee();
+		BigDecimal thirdOperationPrice = thirdOperationFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal xPay = waybillEntity.getXPay();
+		BigDecimal xPayPrice = xPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal dPay = waybillEntity.getDPay();
+		BigDecimal dPayPrice = dPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal hPay = waybillEntity.getHPay();
+		BigDecimal hPayPrice = hPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal yPay = waybillEntity.getYPay();
+		BigDecimal yPayPrice = yPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+
+		//把details转化成不分组以productName为key的map
+		Map<String, WarehouseWayBillDetail> detailsMap = details.stream()
+			.collect(Collectors.toMap(WarehouseWayBillDetail::getProductName, detail -> detail, (a, b) -> a));
+
+		if(waybillType.equals(1)){
+			//订制品
+			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findAdvanceDetailVoByAdvanceIds(advanceIds);
+			//把list按goodsName分组，并统计一个count，转成一个map
+//			Map<String, Integer> countMap = list.stream()
+//				.collect(Collectors.toMap(TrunklineAdvanceDetailVO::getGoodsName, TrunklineAdvanceDetailVO::getQuantity, Integer::sum));
+//			countMap.keySet().forEach(goodsName -> {
+//				WarehouseWayBillDetail warehouseWayBillDetail = detailsMap.get(goodsName);
+//
+//
+//
+//			});
+
+
+
+			List<JSONObject> jsonList = new ArrayList<>();
+			list.forEach(advanceDetailVO -> {
+				JSONObject json = new JSONObject();
+				String goodsName = advanceDetailVO.getGoodsName();
+				BigDecimal openPrice = BigDecimal.ZERO;
+				json.put("orderPackageCode",advanceDetailVO.getOrderPackageCode());
+				json.put("orderCode",advanceDetailVO.getOrderCode());
+				json.put("productId",advanceDetailVO.getGoodsId());
+				json.put("productName",goodsName);
+				json.put("totalNum",advanceDetailVO.getQuantity());
+				json.put("totalWeight",advanceDetailVO.getWeight());
+				json.put("totalVolume",advanceDetailVO.getVolume());
+
+				WarehouseWayBillDetail warehouseWayBillDetail = detailsMap.get(goodsName);
+				if(!Objects.isNull(warehouseWayBillDetail)){
+					Integer num = warehouseWayBillDetail.getNum();
+					if(num > 0){
+						json.put("freightFee",warehouseWayBillDetail.getPrice());
+						openPrice = openPrice.add(warehouseWayBillDetail.getPrice());
+						json.put("deliveryFee",warehouseWayBillDetail.getDeliveryPrice());
+						json.put("deliveryServiceFee",warehouseWayBillDetail.getDeliveryPrice());
+						openPrice = openPrice.add(warehouseWayBillDetail.getDeliveryPrice());
+						warehouseWayBillDetail.setNum(num-1);
+						detailsMap.put(goodsName,warehouseWayBillDetail);
+					}
+				}
+				json.put("warehouseServiceFee",BigDecimal.ZERO);
+				json.put("warehouseFee",BigDecimal.ZERO);
+				json.put("warehouseManageFee",BigDecimal.ZERO);
+				json.put("warehouseSortingFee",BigDecimal.ZERO);
+				json.put("warehouseOperatingFee",BigDecimal.ZERO);
+				json.put("pickupFee",pickupPrice);
+				openPrice = openPrice.add(pickupPrice);
+				json.put("deliveryLoadingFee",BigDecimal.ZERO);
+				json.put("deliverySortingFee",BigDecimal.ZERO);
+				json.put("deliveryUpfloorFee",BigDecimal.ZERO);
+				json.put("deliveryMoveFee",BigDecimal.ZERO);
+				json.put("deliveryDistance",BigDecimal.ZERO);
+				json.put("deliveryCrossingFee",BigDecimal.ZERO);
+				json.put("installFee",installPrice);
+				json.put("quotationFee",insurancePrice);
+				json.put("claimingValue",claimingPrice);
+				json.put("otherFee",otherPrice);
+				json.put("returnFee",rebatePrice);
+				json.put("thirdOprationFee",thirdOperationPrice);
+				json.put("xPay",xPayPrice);
+				json.put("dPay",dPayPrice);
+				json.put("hPay",hPayPrice);
+				json.put("yPay",yPayPrice);
+				openPrice = openPrice.add(installPrice).add(insurancePrice).add(claimingPrice).add(otherPrice).add(rebatePrice).add(thirdOperationPrice).add(xPayPrice).add(dPayPrice).add(hPayPrice).add(yPayPrice);
+				json.put("openPrice",openPrice);
+				jsonList.add(json);
+			});
+
+
+			AtomicInteger atomicOtherNum = new AtomicInteger();
+			List<BigDecimal> otherTotalPriceList = new ArrayList<>();
+			List<BigDecimal> otherTotalDeliveryPriceList = new ArrayList<>();
+			detailsMap.values().forEach(warehouseWayBillDetail -> {
+				if (warehouseWayBillDetail != null && warehouseWayBillDetail.getNum() > 0) {
+					Integer num = warehouseWayBillDetail.getNum();
+					atomicOtherNum.addAndGet(num);
+
+					// 使用 BigDecimal 的 add 方法来正确累加总价，确保精度
+					otherTotalPriceList.add(warehouseWayBillDetail.getPrice().multiply(new BigDecimal(num)));
+					otherTotalDeliveryPriceList.add(warehouseWayBillDetail.getDeliveryPrice().multiply(new BigDecimal(num)));
+				}
+			});
+
+			int otherNum = atomicOtherNum.get();
+			//otherTotalPriceList元素求和
+			BigDecimal otherTotalPrice = otherTotalPriceList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal p = otherTotalPrice.divide(new BigDecimal(otherNum), 2, RoundingMode.HALF_UP);
+			BigDecimal otherTotalDeliveryPrice = otherTotalDeliveryPriceList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal dp = otherTotalDeliveryPrice.divide(new BigDecimal(otherNum), 2, RoundingMode.HALF_UP);
+
+			jsonList.forEach(json -> {
+				BigDecimal op = json.getBigDecimal("openPrice");
+				BigDecimal freightFee = json.getBigDecimal("freightFee");
+				if(Objects.isNull(freightFee)){
+					json.put("freightFee",p);
+					op = op.add(p);
+				}
+				BigDecimal deliveryFee = json.getBigDecimal("deliveryFee");
+				if(Objects.isNull(deliveryFee)){
+					json.put("deliveryFee",dp);
+					json.put("deliveryServiceFee",dp);
+					op = op.add(dp);
+				}
+				json.put("openPrice",op);
+			});
+			jsonObject.put("orderPackageCodes",jsonList);
+
+		}else if(waybillType.equals(2)){
+			//零担
+			List<JSONObject> jsonList = new ArrayList<>();
+			details.forEach(detail -> {
+				Integer num = detail.getNum();
+				JSONObject json = new JSONObject();
+				BigDecimal openPrice = BigDecimal.ZERO;
+				json.put("orderPackageCode",detail.getProductName());
+				json.put("orderCode",waybillNo);
+				json.put("productName",detail.getProductName());
+				json.put("totalNum",num);
+				json.put("totalWeight",detail.getWeight());
+				json.put("totalVolume",detail.getVolume());
+				json.put("freightFee",detail.getSubtotalFreight());
+				openPrice = openPrice.add(detail.getSubtotalFreight());
+				json.put("deliveryFee",detail.getSubtotalDeliveryFee());
+				openPrice = openPrice.add(detail.getSubtotalDeliveryFee());
+				json.put("warehouseServiceFee",BigDecimal.ZERO);
+				json.put("warehouseFee",BigDecimal.ZERO);
+				json.put("warehouseManageFee",BigDecimal.ZERO);
+				json.put("warehouseSortingFee",BigDecimal.ZERO);
+				json.put("warehouseOperatingFee",BigDecimal.ZERO);
+				json.put("pickupFee",pickupPrice.multiply(new BigDecimal(num)));
+				openPrice = openPrice.add(pickupPrice.multiply(new BigDecimal(num)));
+				json.put("deliveryLoadingFee",BigDecimal.ZERO);
+				json.put("deliverySortingFee",BigDecimal.ZERO);
+				json.put("deliveryUpfloorFee",BigDecimal.ZERO);
+				json.put("deliveryMoveFee",BigDecimal.ZERO);
+				json.put("deliveryDistance",BigDecimal.ZERO);
+				json.put("deliveryCrossingFee",BigDecimal.ZERO);
+				json.put("installFee",installPrice);
+				openPrice = openPrice.add(installPrice.multiply(new BigDecimal(num)));
+				json.put("quotationFee",insurancePrice);
+				openPrice = openPrice.add(insurancePrice.multiply(new BigDecimal(num)));
+				json.put("claimingValue",claimingPrice);
+				openPrice = openPrice.add(claimingPrice.multiply(new BigDecimal(num)));
+				json.put("otherFee",otherPrice);
+				openPrice = openPrice.add(otherPrice.multiply(new BigDecimal(num)));
+				json.put("returnFee",rebatePrice);
+				openPrice = openPrice.add(rebatePrice.multiply(new BigDecimal(num)));
+				json.put("thirdOprationFee",thirdOperationPrice);
+				openPrice = openPrice.add(thirdOperationPrice.multiply(new BigDecimal(num)));
+				json.put("xPay",xPayPrice);
+				openPrice = openPrice.add(xPayPrice.multiply(new BigDecimal(num)));
+				json.put("dPay",dPayPrice);
+				openPrice = openPrice.add(dPayPrice.multiply(new BigDecimal(num)));
+				json.put("hPay",hPayPrice);
+				openPrice = openPrice.add(hPayPrice.multiply(new BigDecimal(num)));
+				json.put("yPay",yPayPrice);
+				openPrice = openPrice.add(yPayPrice.multiply(new BigDecimal(num)));
+				json.put("openPrice",openPrice);
+				jsonList.add(json);
+			});
+			jsonObject.put("orderPackageCodes",jsonList);
+		}
+
+		FanoutMsg build = FanoutMsg.builder().msg(jsonObject.toJSONString())
+			.exchange(FanoutConstants.trunkline.UPDATEWAYBILL.EXCHANGE).build();
+
+		sendFanoutService.sendFanoutMsg(build);
+
+	}
+
+
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -633,7 +633,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		carsLoadService.sendRabbitMessageOpenOrder(advanceIds, waybillId);
 
 		//发布开单广播
-//		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, advanceIds);
+		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, advanceIds);
 
 		Map<String,Object> map = new HashMap<>();
 		map.put("waybillId",waybillId);
@@ -843,7 +843,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		trunklineWaybillOrderService.save(trunklineWaybillOrderEntity);
 
 		//发布开单广播
-//		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, null);
+		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, null);
 
 		Map<String,Object> map = new HashMap<>();
 		map.put("waybillId",waybillId);
@@ -2078,7 +2078,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405, "运单已作废");
 		}
 
-
 		String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity);
 
 		warehouseWaybillClient.updateEntity(waybillEntity);
@@ -2087,6 +2086,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//异步存入日志
 		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
 
+
+		List<WarehouseWayBillDetail> wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo);
+
+		List<Long> waybillIds = new ArrayList<>();
+		waybillIds.add(waybillId);
+		List<Long> advanceIds = trunklineWaybillOrderService.findAdvanceIdsByWaybillIds(waybillIds);
+
+		openOrderAsyncService.sendUpdateWaybillFanout(waybillEntity,wayBillDetailList,advanceIds);
+
 		return R.success("改单成功");
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/PackageTrackLogAsyncServiceImpl.java

@@ -1,13 +1,16 @@
 package com.logpm.trunkline.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
+import com.logpm.trunkline.service.ISendFanoutService;
 import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
 import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
 import com.logpm.warehouse.feign.IWarehousePackageTrackLogClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.annotations.LogpmAsync;
-import org.springframework.scheduling.annotation.Async;
+import org.springblade.common.constant.broadcast.FanoutConstants;
+import org.springblade.common.model.FanoutMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -21,6 +24,7 @@ public class PackageTrackLogAsyncServiceImpl implements IPackageTrackLogAsyncSer
 
 	private final IWarehousePackageTrackLogClient warehousePackageTrackLogClient;
 	private final ITrunklineWaybillPackageService waybillPackageService;
+	private final ISendFanoutService sendFanoutService;
 
 	@LogpmAsync("asyncExecutor")
 	@Override
@@ -58,5 +62,18 @@ public class PackageTrackLogAsyncServiceImpl implements IPackageTrackLogAsyncSer
 		waybillPackageService.updatePackageStatus(orderPackageCodes, workNode);
 	}
 
+	@LogpmAsync("asyncExecutor")
+	@Override
+	public void sendPackageWorkNodeFanout(List<String> orderPackageCodes,Integer workNode) {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("orderPackageCodes",orderPackageCodes);
+		jsonObject.put("workNode",workNode);
+
+		FanoutMsg build = FanoutMsg.builder().msg(jsonObject.toJSONString())
+			.exchange(FanoutConstants.trunkline.PACKAGNODE.EXCHANGE).build();
+
+		sendFanoutService.sendFanoutMsg(build);
+	}
+
 }
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@@ -157,7 +157,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 			packageStatus = 30;
 		} else if (WorkNodeEnums.DISTRIBUTION_LOADING.getCode().equals(workNode)) {
 			packageStatus = 40;
-		} else if (WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode().equals(workNode)) {
+		} else if (WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode().equals(workNode) ||WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode().equals(workNode)||WorkNodeEnums.SIGN_DIRECT_SHIPPER.getCode().equals(workNode)) {
 			packageStatus = 50;
 		}
 
@@ -187,6 +187,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 
 		}
 
+		packageTrackLogAsyncService.sendPackageWorkNodeFanout(orderPackageCodes,workNode);
 
 	}
 }