From 366f0e7152b8ffc5c68ba8b217fd88c038698239 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 4 Dec 2024 17:18:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/statistics/listener/mq/WaybillCheckListener.java | 4 ++++ .../com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java index 251c6e0cf..62123b642 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java @@ -206,6 +206,7 @@ public class WaybillCheckListener { String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); Integer trunklineCompleteOrNot = waybillEntity.getTrunklineCompleteOrNot(); Integer pickupCompleteOrNot = waybillEntity.getPickupCompleteOrNot(); + Date signTime = waybillEntity.getSignTime(); // BigDecimal pickupFee = Objects.isNull(waybillEntity.getPickupFee())?BigDecimal.ZERO:waybillEntity.getPickupFee(); BigDecimal warehouseManagementFee = Objects.isNull(waybillEntity.getWarehouseManagementFee()) ? BigDecimal.ZERO : waybillEntity.getWarehouseManagementFee(); @@ -259,6 +260,7 @@ public class WaybillCheckListener { orderInfoEntity.setConsignee(consignee); orderInfoEntity.setTypeService(serviceType); orderInfoEntity.setSignStatus(0); + orderInfoEntity.setSignDate(signTime); orderInfoEntity.setSyncFeeStatus(0); orderInfoEntity.setCreateReconciliationOrderStatus(0); orderInfoEntity.setConfirmBalanceOrderStatus(0); @@ -485,6 +487,7 @@ public class WaybillCheckListener { String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); Integer trunklineCompleteOrNot = waybillEntity.getTrunklineCompleteOrNot(); Integer pickupCompleteOrNot = waybillEntity.getPickupCompleteOrNot(); + Date signTime = waybillEntity.getSignTime(); //单价计算 // BigDecimal pickupFee = Objects.isNull(waybillEntity.getPickupFee())?BigDecimal.ZERO:waybillEntity.getPickupFee(); @@ -551,6 +554,7 @@ public class WaybillCheckListener { orderInfoEntity.setConsigneeId(consigneeId); orderInfoEntity.setConsignee(consignee); orderInfoEntity.setTypeService(serviceType); + orderInfoEntity.setSignDate(signTime); orderInfoEntity.setSignStatus(0); orderInfoEntity.setSyncFeeStatus(0); orderInfoEntity.setCreateReconciliationOrderStatus(0); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java index 2a89e1d7c..168018aec 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java @@ -79,10 +79,10 @@ public class StatisticsOrderInfoExportVO implements Serializable { @ExcelProperty(value = "支付方式") private String payWay; // 支付方式 - @ExcelProperty(value = "物料品类") + @ExcelProperty(value = "品类名称") private String goodsName; // 物料品类 - @ExcelProperty(value = "物料品类单价") + @ExcelProperty(value = "品类单价") private String goodsPrice; // 物料品类 @ExcelProperty(value = "订单数量")