master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
1 changed files with 9 additions and 4 deletions
Showing only changes of commit e9a17ec899 - Show all commits

View File

@ -426,6 +426,9 @@ public class ResultMapper implements Serializable {
Optional<Field<String>> oPca = Optional.ofNullable(i.getProcessingchargeamount());
Optional<Field<String>> oPcc = Optional.ofNullable(i.getProcessingchargecurrency());
if (oPca.isPresent() && oPcc.isPresent()) {
Field<String> pca = oPca.get();
Field<String> pcc = oPcc.get();
if(!pca.getValue().trim().equals("") && !pcc.getValue().trim().equals("")){
APC apc = new APC();
apc.setCurrency(oPcc.get().getValue());
apc.setAmount(oPca.get().getValue());
@ -434,6 +437,8 @@ public class ResultMapper implements Serializable {
}
}
private static List<Provenance> getUniqueProvenance(List<Provenance> provenance) {
Provenance iProv = new Provenance();