echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
huangxh3 2024-03-01 16:07:31 +08:00
parent f7538a1e11 e8413344fb
commit ab41a4abb8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/chint/application/dtos/response/LegRes.java
View File

@ -7,6 +7,7 @@ import com.chint.domain.aggregates.order.LegExtensionField;
import com.chint.domain.aggregates.order.Location; import com.chint.domain.aggregates.order.Location;
import com.chint.domain.aggregates.order.OrderDetail; import com.chint.domain.aggregates.order.OrderDetail;
import com.chint.domain.value_object.enums.CurrencyType; import com.chint.domain.value_object.enums.CurrencyType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
@ -30,11 +31,21 @@ public class LegRes {
private String amount; private String amount;
private String legTypeName; private String legTypeName;
private String legTypeEnName; private String legTypeEnName;
@ApiModelProperty("其他费用类型")
private Integer amountType; private Integer amountType;
@ApiModelProperty("其他费用类型名称")
private String amountTypeName; private String amountTypeName;
@ApiModelProperty("其他费用类型英文名称")
private String amountTypeEnName; private String amountTypeEnName;
@ApiModelProperty("费用说明")
private String expenseExplanation;
@ApiModelProperty("初始地详细")
private String originDescription;
@ApiModelProperty("目的地详细")
private String destinationDescription;
private Integer legStatus; private Integer legStatus;
private String legStatusName; private String legStatusName;
private CurrencyType currencyType; private CurrencyType currencyType;
@ -54,7 +65,9 @@ public class LegRes {
legRes.setAmountType(legExtensionField.getAmountType()); legRes.setAmountType(legExtensionField.getAmountType());
legRes.setAmountTypeName(legExtensionField.getAmountTypeName()); legRes.setAmountTypeName(legExtensionField.getAmountTypeName());
legRes.setAmountTypeEnName(legExtensionField.getAmountTypeEnName()); legRes.setAmountTypeEnName(legExtensionField.getAmountTypeEnName());
legRes.setExpenseExplanation(legExtensionField.getExpenseExplanation());
legRes.setOriginDescription(legExtensionField.getOriginDescription());
legRes.setDestinationDescription(legExtensionField.getDestinationDescription());
if (legExtensionField.getLocationIds() != null) { if (legExtensionField.getLocationIds() != null) {
List<LocationRes> locationResList = new ArrayList<>(); List<LocationRes> locationResList = new ArrayList<>();
List<Location> locationList = legExtensionField.getLocationList(); List<Location> locationList = legExtensionField.getLocationList();
@ -66,7 +79,6 @@ public class LegRes {
} }
legRes.setOriginLocation(LocationRes.copyFrom(leg.getOriginLocation())); legRes.setOriginLocation(LocationRes.copyFrom(leg.getOriginLocation()));
legRes.setDestinationLocation(LocationRes.copyFrom(leg.getDestinationLocation())); legRes.setDestinationLocation(LocationRes.copyFrom(leg.getDestinationLocation()));
return legRes; return legRes;
} }
} }

1
src/main/java/com/chint/application/queryies/OrderQuery.java
View File

@ -156,6 +156,7 @@ public class OrderQuery {
.flatMap(leg -> Stream.of(leg.getOriginLocation(), leg.getDestinationLocation())) .flatMap(leg -> Stream.of(leg.getOriginLocation(), leg.getDestinationLocation()))
.map(LocationRes::copyFrom) .map(LocationRes::copyFrom)
.distinct() .distinct()
.filter(Objects::nonNull)
.toList(); .toList();
res.setLocationResList(locationRes); res.setLocationResList(locationRes);
res.setUserName(currentUser.getName()); res.setUserName(currentUser.getName());