ufo / ufo-platform · Commits

Go to a project

Authored by LUOXC
Commit c4208b6c1bb8e03bd869542392e8e8713c9f967d 1 parent a6696d4e

fixbug

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
@@ -66,9 +66,9 @@ public class TradeBillsListBuilder { @@ -66,9 +66,9 @@ public class TradeBillsListBuilder {
66 .map(Object::toString) 66 .map(Object::toString)
67 .switchIfEmpty(Mono.justOrEmpty(item.getId()) 67 .switchIfEmpty(Mono.justOrEmpty(item.getId())
68 .map(transferMessageMap::get) 68 .map(transferMessageMap::get)
69 - .map(TradeBillsTransferMessage::getOutTradeNo)  
70 - .defaultIfEmpty("-"))  
71 - .block(); 69 + .map(TradeBillsTransferMessage::getOutTradeNo))
  70 + .blockOptional()
  71 + .orElse("-");
72 } 72 }
73 73
74 private String buildTimeStr(Integer time) { 74 private String buildTimeStr(Integer time) {
@@ -90,9 +90,9 @@ public class TradeBillsListBuilder { @@ -90,9 +90,9 @@ public class TradeBillsListBuilder {
90 .map(TradeBillsTransferMessage::tradeResultMessage) 90 .map(TradeBillsTransferMessage::tradeResultMessage)
91 .switchIfEmpty(Mono.justOrEmpty(item.getPayErrorCode()) 91 .switchIfEmpty(Mono.justOrEmpty(item.getPayErrorCode())
92 .map(AlipayBatchTransferErrorEnum::getByCode) 92 .map(AlipayBatchTransferErrorEnum::getByCode)
93 - .map(AlipayBatchTransferErrorEnum::getDesc)  
94 - .defaultIfEmpty(e.getDesc()))  
95 - .block(); 93 + .map(AlipayBatchTransferErrorEnum::getDesc))
  94 + .blockOptional()
  95 + .orElse(e.getDesc());
96 desc.append(failReason); 96 desc.append(failReason);
97 }); 97 });
98 return desc.toString(); 98 return desc.toString();