From 735241eae1d57f5ca619ae93b034eb11fcaaa398 Mon Sep 17 00:00:00 2001 From: lulz1 Date: Thu, 11 Jul 2024 12:46:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=AD=BE=E8=AF=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8A=A0=E6=80=A5=E5=9B=9E=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chint/application/dtos/response/LegRes.java | 5 +++++ src/main/java/com/chint/application/queryies/OrderQuery.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chint/application/dtos/response/LegRes.java b/src/main/java/com/chint/application/dtos/response/LegRes.java index da5e082b..18d39c8b 100644 --- a/src/main/java/com/chint/application/dtos/response/LegRes.java +++ b/src/main/java/com/chint/application/dtos/response/LegRes.java @@ -57,6 +57,7 @@ public class LegRes { private String legApprovalStatusName; private String currencyType; private String locationNameList; + private String extension; private List otherLocationList; private List orderDetails; //这个属性不做持久化保存 ,根据下单事件进行获取 @@ -85,6 +86,9 @@ public class LegRes { } legRes.setOtherLocationList(locationResList); } + if (legExtensionField.getExtension() != null) { + legRes.setExtension(legExtensionField.getExtension()); + } } if (leg.getCurrencyType() != null) { legRes.setCurrencyType(leg.getCurrencyType().getCode()); @@ -105,6 +109,7 @@ public class LegRes { StringBuilder sb = getStringBuilder(leg, originLocation, destinationLocation); legRes.setLocationNameList(sb.toString()); + return legRes; } diff --git a/src/main/java/com/chint/application/queryies/OrderQuery.java b/src/main/java/com/chint/application/queryies/OrderQuery.java index c1caf87e..116c989e 100644 --- a/src/main/java/com/chint/application/queryies/OrderQuery.java +++ b/src/main/java/com/chint/application/queryies/OrderQuery.java @@ -473,7 +473,7 @@ public class OrderQuery { Integer amountType = legExtensionField.getAmountType(); if (amountType != null && amountType.equals(LEG_OTHER_AMOUNT_TYPE_VISA)) { scheduleDetailBuilder.amountDescription(legExtensionField.getExtension() + - "。 理由:" + + " 理由:" + legExtensionField.getExpenseExplanation()); } }