ufo / ufo-platform · Commits

Go to a project

Authored by LUOXC
Commit 43dca08ad048684bcc28c25de70b9f6fc3bd3067 1 parent f97c13d9

fixbug

Inline Side-by-side
Showing 2 changed files with 18 additions and 8 deletions
... ... @@ -32,3 +32,4 @@ searchword/.gitignore
searchword/target/
user/ReadMe.txt
user/target/
*.factorypath
... ...
... ... @@ -271,13 +271,7 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
private Map<Integer, String> getTransferOutTradeNoMap(List<TradeBills> tradeBillsList) {
List<Long> orderCodes = tradeBillsList.stream()
.filter(item-> {
MoneyTypeEnum moneyTypeEnum = MoneyTypeEnum.getMoneyTypeByUserTypeAndTradeType(item.getUserType(), item.getTradeType());
return moneyTypeEnum == MoneyTypeEnum.deposit_rebate
|| moneyTypeEnum == MoneyTypeEnum.buyer_compensatoryPayment
|| moneyTypeEnum == MoneyTypeEnum.seller_goodsPayment
|| moneyTypeEnum == MoneyTypeEnum.seller_compensatoryPayment ;
})
.filter(item-> isTransferTrade(item))
.map(TradeBills::getOrderCode)
.collect(Collectors.toList());
if(CollectionUtils.isEmpty(orderCodes)){
... ... @@ -288,6 +282,14 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
.collect(Collectors.toMap(TradeBillsTransferOutTradeNo::getId,TradeBillsTransferOutTradeNo::getOutTradeNo));
}
private boolean isTransferTrade(TradeBills tradeBills){
MoneyTypeEnum moneyTypeEnum = MoneyTypeEnum.getMoneyTypeByUserTypeAndTradeType(tradeBills.getUserType(), tradeBills.getTradeType());
return moneyTypeEnum == MoneyTypeEnum.deposit_rebate
|| moneyTypeEnum == MoneyTypeEnum.buyer_compensatoryPayment
|| moneyTypeEnum == MoneyTypeEnum.seller_goodsPayment
|| moneyTypeEnum == MoneyTypeEnum.seller_compensatoryPayment ;
}
public AuthorizeResultRespVO queryAuthorizeInfoByUid(Integer uid){
if(uid==null||uid<=0){
return null;
... ... @@ -361,7 +363,14 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
resp.setPaidOrderCode(Optional.ofNullable(item.getPaidOrderCode())
.filter(e -> e > 0)
.map(Object::toString)
.orElseGet(() -> outTradeNoMap.getOrDefault(item.getId(), outTradeNoMap.getOrDefault(item.getDealRelateId(), "-"))));
.orElseGet(() -> {
String defaultValue = "-";
if(isTransferTrade(item)){
return outTradeNoMap.getOrDefault(item.getId(), outTradeNoMap.getOrDefault(item.getDealRelateId(), defaultValue));
}else {
return defaultValue;
}
}));
resp.setAmount(item.getAmount());
resp.setIncomeOutcome(item.getIncomeOutcome());
resp.setCreateTimeStr(null == item.getCreateTime() ? StringUtils.EMPTY
... ...