|
|
@ -673,7 +673,7 @@ public class DeliverFinishReportListener implements ReportService { |
|
|
|
if (NumberUtil.equals(overZoneKilometerRule, 3)) { |
|
|
|
if (NumberUtil.equals(overZoneKilometerRule, 3)) { |
|
|
|
Integer overZoneSiteMode = rule.getOverZoneSiteMode(); |
|
|
|
Integer overZoneSiteMode = rule.getOverZoneSiteMode(); |
|
|
|
if (NumberUtil.equals(overZoneSiteMode, 1)) { |
|
|
|
if (NumberUtil.equals(overZoneSiteMode, 1)) { |
|
|
|
BigDecimal total = null; |
|
|
|
BigDecimal total = BigDecimal.ZERO; |
|
|
|
String lastCode = null; |
|
|
|
String lastCode = null; |
|
|
|
if (CollUtil.isNotEmpty(firstRouteMap)) { |
|
|
|
if (CollUtil.isNotEmpty(firstRouteMap)) { |
|
|
|
for (Map.Entry<String, String> firstEntry : firstRouteMap.entrySet()) { |
|
|
|
for (Map.Entry<String, String> firstEntry : firstRouteMap.entrySet()) { |
|
|
@ -709,7 +709,7 @@ public class DeliverFinishReportListener implements ReportService { |
|
|
|
// 按区域计费
|
|
|
|
// 按区域计费
|
|
|
|
if (NumberUtil.equals(overZoneSiteMode, 2)) { |
|
|
|
if (NumberUtil.equals(overZoneSiteMode, 2)) { |
|
|
|
if (CollUtil.isNotEmpty(overZoneEntityMap)) { |
|
|
|
if (CollUtil.isNotEmpty(overZoneEntityMap)) { |
|
|
|
BigDecimal total = null; |
|
|
|
BigDecimal total = BigDecimal.ZERO; |
|
|
|
String lastCode = null; |
|
|
|
String lastCode = null; |
|
|
|
if (CollUtil.isNotEmpty(firstRouteMap)) { |
|
|
|
if (CollUtil.isNotEmpty(firstRouteMap)) { |
|
|
|
for (Map.Entry<String, String> firstEntry : firstRouteMap.entrySet()) { |
|
|
|
for (Map.Entry<String, String> firstEntry : firstRouteMap.entrySet()) { |
|
|
|