wks 2 jaren geleden
bovenliggende
commit
a524117fef

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

@@ -142,7 +142,7 @@ public class SysSwitchConfigServiceImpl extends ServiceImpl<SysSwitchConfigMappe
         } else if (ManagementSource.MS_02.getCode().equals(dept.getManagementSource())) {
             return isEnabled(SwitchConfig.FEE_01.getCode());
         }
-        return false;
+        return true;
     }
 }
 

+ 0 - 1
src/main/java/com/ydtech/modules/fee/controller/ConfigController.java

@@ -4,7 +4,6 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fee.dto.po.InsFeeOrderConfig;
 import com.ydtech.modules.fee.service.InsFeeOrderConfigService;
-import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

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