From df5a86489dca5eabb32a378869a027a00b402142 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 24 Dec 2024 18:53:58 +0800
Subject: [PATCH] =?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 ++--
 .../statistics/mapper/ExpenseDispatchTrainDetailMapper.xml    | 1 +
 2 files changed, 3 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 743fdf2b0..37737133b 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
@@ -964,13 +964,13 @@ public class DeliverFinishReportListener implements ReportService {
 					if (StrUtil.isNotEmpty(arrivePositioning)) {
 						// A-B A-C A-D 仓库为起点到每一个点的距离
 						Long first = GaoDeApiUtil.measureDistance(firstPositioning, arrivePositioning);
-						firstRouteMap.put(value1.getSignReservationCode(), Convert.toStr(first / 1000));
+						firstRouteMap.put(value1.getSignReservationCode(), Convert.toStr(ObjectUtil.isNotEmpty(first) ? NumberUtil.div(new BigDecimal(first), 1000) : 0L / 1000));
 						if (StrUtil.isEmpty(beforePositioning)) {
 							beforePositioning = firstPositioning;
 						}
 						// A-B B-C C-D 每一个点为起点到下一个点的距离
 						Long distance = GaoDeApiUtil.measureDistance(beforePositioning, arrivePositioning);
-						allRouteMap.put(value1.getSignReservationCode(), Convert.toStr(distance / 1000));
+						allRouteMap.put(value1.getSignReservationCode(), Convert.toStr(ObjectUtil.isNotEmpty(distance) ?  NumberUtil.div(new BigDecimal(distance), 1000) : 0L / 1000));
 						beforePositioning = arrivePositioning;
 					}
 				}
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml
index 68e9e287e..b4196e805 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml
@@ -43,6 +43,7 @@
         <if test="expenseDispatchTrainDetail.deliveryVehicle != null and expenseDispatchTrainDetail.deliveryVehicle != ''">
            and delivery_vehicle like concat('%', #{expenseDispatchTrainDetail.deliveryVehicle}, '%')
         </if>
+        order by id desc
     </select>