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 a433e4813..72f67183e 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 @@ -5491,6 +5491,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>> updateSign isSuccess ={}",isSuccess); if (isSuccess) { this.updateById(distributionSignfor); // 创建异步队列推送老系统的的签收信息 构建请求参数 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 06c6bb0ab..714953072 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -442,7 +442,7 @@ public class FactoryXxlJob { orderStatusDTO.setStatus("1"); // 查询老系统的操作人 - orderStatusDTO.setUsername("zhangsna ");// 操作人 + orderStatusDTO.setUsername("admin");// 操作人 ouPaiFactoryService.handleStatusData(orderStatusDTO); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index f5dd9de9a..75b18ea74 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -683,8 +683,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}", resp); // TODO: 2023/10/25 不知道返回成功的状态是多少 // 需要修改包件对应的状态 - factoryPackageEntity.setPushStatus(1); - factoryPackageService.updateById(factoryPackageEntity); + checkOpFactoryPackagePushStatus(factoryPackageEntity); } } log.info(" >>>>>>>>>>>>>>>>>>>>>>> 物流状态传递成功"); diff --git a/blade-service/logpm-old-project/Dockerfile b/blade-service/logpm-old-project/Dockerfile index 57cd7ddb4..482a7185d 100644 --- a/blade-service/logpm-old-project/Dockerfile +++ b/blade-service/logpm-old-project/Dockerfile @@ -10,5 +10,7 @@ EXPOSE 8500 ADD ./target/logpm-old-project.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m" "app.jar"] +ENV JAVA_OPTS="-Xms512m -Xmx1024m" + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "-Xms128m","-Xmx512m","app.jar"] CMD ["--spring.profiles.active=test"]