From a27bc9a80bdbc595e89d65c9bfdc8de7505d32c8 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 25 Dec 2024 02:25:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 优化配送明细广播推送 --- .../receiver/report/DeliverFinishReportListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index 37737133b..ae8e0c002 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -673,7 +673,7 @@ public class DeliverFinishReportListener implements ReportService { if (NumberUtil.equals(overZoneKilometerRule, 3)) { Integer overZoneSiteMode = rule.getOverZoneSiteMode(); if (NumberUtil.equals(overZoneSiteMode, 1)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { @@ -709,7 +709,7 @@ public class DeliverFinishReportListener implements ReportService { // 按区域计费 if (NumberUtil.equals(overZoneSiteMode, 2)) { if (CollUtil.isNotEmpty(overZoneEntityMap)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { From 3f7e44dd2ae44bc3ed50e6728786ef08f79b5d3e Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 25 Dec 2024 02:27:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 优化配送明细广播推送 --- .../receiver/report/DeliverFinishReportListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index ae8e0c002..5bff37c1f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -395,7 +395,7 @@ public class DeliverFinishReportListener implements ReportService { } // 最大公里数计算 if (NumberUtil.equals(kilometerCalculationRule, 3)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { @@ -521,7 +521,7 @@ public class DeliverFinishReportListener implements ReportService { } // 最大公里数计算 if (NumberUtil.equals(subsidyKilometerRule, 3)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { From 126c2677be6701d81d7941c8be9d39f7ecc9e68c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 25 Dec 2024 08:21:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=201.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index ad13b609c..765ae7926 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -1221,7 +1221,7 @@ SELECT GROUP_CONCAT(DISTINCT lww.brand) brands from logpm_warehouse_waybill lww LEFT JOIN logpm_trunkline_cars_load_scan ltcls on lww.id= ltcls.waybill_id - where ltcls.load_code=#{loadCode} GROUP BY lww.brand + where ltcls.load_code=#{loadCode}