From d636ab39b9f0bb8a601bd23735b33901037c2081 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 6 Apr 2024 21:29:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E7=9A=84log=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index cef8fa9a4..d793a6695 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -4242,13 +4242,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListEntityList = distributionReservationMapper.getReservationPackage(page, orderIds, distributionDeliveryInfoDTO); parcelListVOIPage.setTotal(parcelListEntityList.getTotal()); // List parcelListEntityList = distributionReservationMapper.getReservationPackageNew(distributionDeliveryInfoDTO); - log.info(">>>>>> parcelListEntityList {}", parcelListEntityList); +// log.info(">>>>>> parcelListEntityList {}", parcelListEntityList); List parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords()); for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { - log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); +// log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); if (Func.isNotEmpty(loadingDataMap)) { DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId()); - log.info(">>>>>> loadscanEntity {}", loadscanEntity); +// log.info(">>>>>> loadscanEntity {}", loadscanEntity); if (Func.isNotEmpty(loadscanEntity)) { if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { @@ -4294,7 +4294,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>> distributionParcelListVO2 {}", distributionParcelListVO); +// log.info(">>>>>> distributionParcelListVO2 {}", distributionParcelListVO); distributionParcelListVOS.add(distributionParcelListVO); } From ccf47c044fed9cec12cadf636232a53042f66f34 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 6 Apr 2024 21:42:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=8D=A2=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E4=BB=93=E5=BA=93key=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/common/constant/RedisKeyConstant.java | 2 +- .../com/logpm/basicdata/feign/BasicdataWarehouseClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java index 5633f055d..6abd63ee5 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java @@ -18,7 +18,7 @@ public class RedisKeyConstant { */ public static final String TASK_QUEST_CHILD_KEY ="cache:task-quest-child-key:"; - public static final String BASIC_DATA_WAREHOUSE_KEY ="cache:basic-data-list:"; + public static final String BASIC_DATA_WAREHOUSE_LIST_KEY ="cache:basic-data-warehouse-list:"; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java index 14ee1cda3..ab0872439 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java @@ -172,7 +172,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { - String key =RedisKeyConstant.BASIC_DATA_WAREHOUSE_KEY + deptId; + String key =RedisKeyConstant.BASIC_DATA_WAREHOUSE_LIST_KEY + deptId; BasicdataWarehouseEntity o = bladeRedis.get(key); log.info(">>> 获取的仓库的信息 o ={}",o); if(ObjectUtils.isNull(o)){