From f692a7aa262222b4a58beb298452256e4e3a8d28 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 22 Oct 2024 14:34:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=94=AE?= =?UTF-8?q?=E5=90=8Exxljob=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 将售后的xxljob配置移到nacos中 --- .../src/main/resources/application.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/resources/application.yml b/blade-service/logpm-aftersales/src/main/resources/application.yml index 89cc65feb..1d248aac9 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application.yml @@ -36,17 +36,5 @@ spring: main: allow-circular-references: true - -xxl: - job: - accessToken: '' - admin: - addresses: http://127.0.0.1:7009/xxl-job-admin - executor: - appname: logpm-aftersales-xxljob - ip: 127.0.0.1 - logpath: ../data/applogs/logpm-aftersales-xxljob/jobhandler - logretentiondays: -1 - port: 7012 logpm: file_system_path: /home/java_works/logpm_temp_file/ From 693c36b1220c7938c90ee1b8a649bafd2e0a0067 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 22 Oct 2024 14:36:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E4=BD=9C=E4=B8=9A=E5=B9=BF=E6=92=AD=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=8D=E6=A0=B8=E6=8E=A8=E9=80=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改配送作业广播预约单号确实问题 --- .../distribution/receiver/report/BillReViewReportListener.java | 2 +- .../distribution/receiver/report/ReViewReportListener.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java index 97607b5fe..7854d3a74 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java @@ -71,7 +71,7 @@ public class BillReViewReportListener { .orderPackageCode(detail.getPackageCode()) .reviewUserName(bean.getOperator()) .reviewTime(bean.getOperatorTime()) - .bizCode(detail.getPickupBatch()) + .bizCode(vo.getPickupBatch()) .bizStatus(100) .build(); if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java index c6019aef9..182e47703 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java @@ -76,7 +76,6 @@ public class ReViewReportListener { .build(); if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) { qualityDeliverEntity.setConditions(1); - qualityDeliverEntity.setLoadNum(1); sendReport(bizOperation, qualityDeliverEntity); } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { qualityDeliverEntity.setOrderCode(detail.getOrderCode());