|
|
@@ -99,7 +99,8 @@ public class KwOrderService {
|
|
|
.setPickupTypeLabel(DictEnum.getLabel(DictTypeEnum.PICKUP_TYPE.getType(), e.getPickupType()))
|
|
|
.setLoadDetailAddressInfo(loadCityName + loadDetailAddress)
|
|
|
.setUnloadDetailAddressInfo(unloadCityName + unloadDetailAddress)
|
|
|
- .setConsignmentStatus(Objects.isNull(e.getEntrustAmount()) || e.getEntrustAmount().compareTo(e.getAmount()) < 0 ? "待托运" : "已托运")
|
|
|
+ .setConsignmentStatus(Objects.isNull(e.getEntrustAmount()) || Objects.isNull(e.getAmount())
|
|
|
+ || e.getEntrustAmount().compareTo(e.getAmount()) < 0 ? "待托运" : "已托运")
|
|
|
.setSource(DictEnum.getLabel(DictTypeEnum.TORDER_SOURCE.getType(), e.getSource()));
|
|
|
result.add(order);
|
|
|
});
|