wks 2 жил өмнө
parent
commit
20be482f22

+ 2 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysSwitchConfigServiceImpl.java

@@ -126,8 +126,8 @@ public class SysSwitchConfigServiceImpl extends ServiceImpl<SysSwitchConfigMappe
             feeLookSwitchesDTO.setFeeView(isEnabled(SwitchConfig.FEE_01.getCode()));
             feeLookSwitchesDTO.setFeeDisplay(isEnabled(SwitchConfig.FDA_01.getCode()));
         }else {
-            feeLookSwitchesDTO.setFeeView(true);
-            feeLookSwitchesDTO.setFeeDisplay(false);
+            feeLookSwitchesDTO.setFeeView(false);
+            feeLookSwitchesDTO.setFeeDisplay(true);
         }
         return feeLookSwitchesDTO;
     }

+ 8 - 4
src/main/java/com/ydtech/modules/fee/service/impl/FeeDisplayServiceImpl.java

@@ -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());