|
|
@@ -45,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.text.DecimalFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -100,6 +101,7 @@ public class KwpSettlementWalletService {
|
|
|
entity.setCreateByText("未知创建人");
|
|
|
entity.setUpdateByText("未知更新人");
|
|
|
}
|
|
|
+ DecimalFormat df = new DecimalFormat("0.00");
|
|
|
|
|
|
Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
//指定返回值
|
|
|
@@ -124,6 +126,8 @@ public class KwpSettlementWalletService {
|
|
|
if (Objects.nonNull(userCacheResDto)) {
|
|
|
settlementWalletVo.setUpdateByText(userCacheResDto.getName());
|
|
|
}
|
|
|
+ settlementWalletVo.setPayPrice(df.format(Objects.isNull(a.getPayPrice()) ? new BigDecimal("0.0") : a.getPayPrice()));
|
|
|
+ settlementWalletVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
|
|
|
return settlementWalletVo;
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
@@ -416,6 +420,7 @@ public class KwpSettlementWalletService {
|
|
|
//增加对应创建人和更新人名称
|
|
|
Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
PageInfo<SettlementWalletDto> pageInfo = new PageInfo<>(settlementWalletDto);
|
|
|
+ DecimalFormat df = new DecimalFormat("0.00");
|
|
|
//指定返回值
|
|
|
List<SettlementWalletVo> collect = settlementWalletDto.stream().map(a -> {
|
|
|
SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
|
|
|
@@ -438,6 +443,8 @@ public class KwpSettlementWalletService {
|
|
|
if (Objects.nonNull(userCacheResDto)) {
|
|
|
settlementWalletVo.setUpdateByText(userCacheResDto.getName());
|
|
|
}
|
|
|
+ settlementWalletVo.setPayPrice(df.format(Objects.isNull(a.getPayPrice()) ? new BigDecimal("0.0") : a.getPayPrice()));
|
|
|
+ settlementWalletVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
|
|
|
return settlementWalletVo;
|
|
|
}).collect(Collectors.toList());
|
|
|
return PageRes.build(pageInfo, collect);
|