From e3af0da456aa3b7fb4c570a6aa88a27bc12a0ec2 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 9 Jan 2024 14:31:21 +0800 Subject: [PATCH] =?UTF-8?q?1=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 6 +- .../impl/DistributionSignforServiceImpl.java | 58 ++++++++++--------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index b3591064f..dabc47e78 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -56,7 +56,7 @@ public interface LauncherConstant { /** * nacos test 地址 */ - String NACOS_TEST_ADDR = "172.16.128.146:8848"; + String NACOS_TEST_ADDR = "192.168.10.106:8848"; /** @@ -72,7 +72,7 @@ public interface LauncherConstant { /** * sentinel test 地址 */ - String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; + String SENTINEL_TEST_ADDR = "192.168.10.106:8858"; /** * seata dev 地址 @@ -88,7 +88,7 @@ public interface LauncherConstant { /** * seata test 地址 */ - String SEATA_TEST_ADDR = "172.16.128.146:8091"; + String SEATA_TEST_ADDR = "192.168.10.106:8091"; /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 2aee8618b..8d0e0f137 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -1020,6 +1020,18 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>> 签收异常报错", e); + throw new CustomerException("当前登录信息不已失效，请重新登录"); + } + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); // ---------------------------------2023-09-09 包件签收调整--------------------------------------------------------------- @@ -1072,17 +1084,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>> 签收异常报错", e); - throw new CustomerException("当前登录信息不已失效，请重新登录"); - } loadscanEntity.setSigningUser(nickName); loadscanEntity.setSigningUserId(userId); @@ -1174,7 +1176,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>> 签收异常报错", e); + throw new CustomerException("当前登录信息不已失效，请重新登录"); + } + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); // ---------------------------------2023-09-09 包件签收调整--------------------------------------------------------------- @@ -1283,22 +1300,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>> 签收异常报错", e); - throw new CustomerException("当前登录信息不已失效，请重新登录"); - } loadscanEntity.setSigningUser(nickName); loadscanEntity.setSigningUserId(userId); - distributionLoadscanService.updateById(loadscanEntity); //缺少一个异步维护包件签收的方法 // distributionAsyncService.changeOrderSignforStatus(collect.get(0)); @@ -1385,7 +1390,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailEntities = distributionReservationMapper.selectInventoryListByReservation(distributionSignforEntity.getReservationId()); @@ -3018,7 +3024,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl