|
@@ -28,12 +28,13 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
|
|
|
public void setUpFeePresentationFormat(OrderVo orderVo) {
|
|
public void setUpFeePresentationFormat(OrderVo orderVo) {
|
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
|
FeeOrderNewVo feeOrderNewVo = orderVo.getFeeOrderNewVo();
|
|
FeeOrderNewVo feeOrderNewVo = orderVo.getFeeOrderNewVo();
|
|
|
- if (feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
|
|
|
|
+ if (!feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
|
|
List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
|
|
|
exportFee.forEach(FeeOrderNewVo.ExportFee::feeVacant);
|
|
exportFee.forEach(FeeOrderNewVo.ExportFee::feeVacant);
|
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
|
List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
|
|
List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
|
|
|
exportFee.forEach(FeeOrderNewVo.ExportFee::feeDivideBy10);
|
|
exportFee.forEach(FeeOrderNewVo.ExportFee::feeDivideBy10);
|
|
|
|
|
+ orderVo.setSumFee(new BigDecimal(orderVo.getSumFee()).divide(new BigDecimal(10)).toString());
|
|
|
}
|
|
}
|
|
|
orderVo.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
|
|
orderVo.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
|
|
|
orderVo.setFeeView(feeLookSwitchesDTO.getFeeView());
|
|
orderVo.setFeeView(feeLookSwitchesDTO.getFeeView());
|
|
@@ -43,7 +44,7 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
|
|
|
@Override
|
|
@Override
|
|
|
public void setUpRevise(List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos) {
|
|
public void setUpRevise(List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos) {
|
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
|
- if (feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
|
|
|
|
+ if (!feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeVacant);
|
|
insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeVacant);
|
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
|
insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeDivideBy10);
|
|
insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeDivideBy10);
|
|
@@ -57,7 +58,7 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
|
|
|
@Override
|
|
@Override
|
|
|
public void setQuote(QuoteRespVo quoteRespVo) {
|
|
public void setQuote(QuoteRespVo quoteRespVo) {
|
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
|
|
|
- if (feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
|
|
|
|
+ if (!feeLookSwitchesDTO.getFeeDisplay()) {
|
|
|
quoteRespVo.feeVacant();
|
|
quoteRespVo.feeVacant();
|
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
} else if (feeLookSwitchesDTO.getFeeView()) {
|
|
|
quoteRespVo.feeDivideBy10();
|
|
quoteRespVo.feeDivideBy10();
|