|
|
@@ -16,7 +16,9 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
@Service
|
|
|
@RequiredArgsConstructor
|
|
|
@@ -28,12 +30,14 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
|
|
|
public void setUpFeePresentationFormat(OrderVo orderVo) {
|
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
|
FeeOrderNewVo feeOrderNewVo = orderVo.getFeeOrderNewVo();
|
|
|
+ List<FeeOrderNewVo.ExportFee> exportFees = Optional.ofNullable(feeOrderNewVo)
|
|
|
+ .map(FeeOrderNewVo::getExportFee)
|
|
|
+ .orElse(new ArrayList<>());
|
|
|
+
|
|
|
if (!feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
- List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
|
|
|
- exportFee.forEach(FeeOrderNewVo.ExportFee::feeVacant);
|
|
|
+ exportFees.forEach(FeeOrderNewVo.ExportFee::feeVacant);
|
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
|
- List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
|
|
|
- exportFee.forEach(FeeOrderNewVo.ExportFee::feeDivideBy10);
|
|
|
+ exportFees.forEach(FeeOrderNewVo.ExportFee::feeDivideBy10);
|
|
|
orderVo.setSumFee(new BigDecimal(orderVo.getSumFee()).divide(new BigDecimal(10)).toString());
|
|
|
}
|
|
|
orderVo.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
|