Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/equipmentreturnrecord/EquipmentReturnRecordMapper.java

@@ -74,12 +74,14 @@ public interface EquipmentReturnRecordMapper extends BaseMapperX<EquipmentReturn
                 .eqIfPresent(EquipmentReturnRecordDO::getUnitCode, reqVO.getUnitCode())
                 .likeIfPresent(EquipmentReturnRecordDO::getUnitName, reqVO.getUnitName())
                 .eqIfPresent(EquipmentReturnRecordDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(EquipmentReturnRecordDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .eqIfPresent(EquipmentReturnRecordDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(EquipmentReturnRecordDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .inIfPresent(EquipmentReturnRecordDO::getSubmitId, reqVO.getSubmitIds())
                 .betweenIfPresent(EquipmentReturnRecordDO::getSubmitTime, reqVO.getSubmitTime())
                 .eqIfPresent(EquipmentReturnRecordDO::getOrderNo, reqVO.getOrderNo())
                 .eqIfPresent(EquipmentReturnRecordDO::getCheckType, reqVO.getCheckType())
+                .eqIfPresent(EquipmentReturnRecordDO::getCheckTypeName, reqVO.getCheckTypeName())
                 .eqIfPresent(EquipmentReturnRecordDO::getAuditReason, reqVO.getAuditReason())
                 .betweenIfPresent(EquipmentReturnRecordDO::getCheckDate, reqVO.getCheckDate())
                 .eqIfPresent(EquipmentReturnRecordDO::getReportCityStatus, reqVO.getReportCityStatus())
@@ -105,6 +107,15 @@ public interface EquipmentReturnRecordMapper extends BaseMapperX<EquipmentReturn
                 .betweenIfPresent(EquipmentReturnRecordDO::getNextCheckDate, reqVO.getNextCheckDate())
                 .eqIfPresent(EquipmentReturnRecordDO::getEquipCode, reqVO.getEquipCode())
                 .eqIfPresent(EquipmentReturnRecordDO::getEquipMainType, reqVO.getEquipMainType());
+
+        if (reqVO.getSubmitTimeStart() != null && reqVO.getSubmitTimeEnd() != null) {
+            wrapper.between(EquipmentReturnRecordDO::getSubmitTime, reqVO.getSubmitTimeStart(), reqVO.getSubmitTimeEnd());
+        }
+
+        if (reqVO.getReturnTimeStart() != null && reqVO.getReturnTimeEnd() != null) {
+            wrapper.between(EquipmentReturnRecordDO::getReturnTime, reqVO.getReturnTimeStart(), reqVO.getReturnTimeEnd());
+        }
+
         wrapper.orderByDesc(EquipmentReturnRecordDO::getCreateTime);
         return selectJoinPage(reqVO, EquipmentReturnRecordRespVO.class, wrapper);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/reportcityrecord/ReportCityRecordMapper.java

@@ -28,6 +28,7 @@ public interface ReportCityRecordMapper extends BaseMapperX<ReportCityRecordDO>
                 .eqIfPresent(ReportCityRecordDO::getEquipType, reqVO.getEquipType())
                 .eqIfPresent(ReportCityRecordDO::getEquipCategory, reqVO.getEquipCategory())
                 .eqIfPresent(ReportCityRecordDO::getCheckType, reqVO.getCheckType())
+                .eqIfPresent(ReportCityRecordDO::getCheckTypeName, reqVO.getCheckTypeName())
                 .eqIfPresent(ReportCityRecordDO::getProductNo, reqVO.getProductNo())
                 .betweenIfPresent(ReportCityRecordDO::getCheckDate, reqVO.getCheckDate())
                 .eqIfPresent(ReportCityRecordDO::getStatus, reqVO.getStatus())
@@ -67,6 +68,7 @@ public interface ReportCityRecordMapper extends BaseMapperX<ReportCityRecordDO>
                 .eqIfPresent(ReportCityRecordDO::getContactPhone, reqVO.getContactPhone())
                 .eqIfPresent(ReportCityRecordDO::getEquipAddress, reqVO.getEquipAddress())
                 .eqIfPresent(ReportCityRecordDO::getEquipStatus, reqVO.getEquipStatus())
+                .eqIfPresent(ReportCityRecordDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .betweenIfPresent(ReportCityRecordDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ReportCityRecordDO::getCurrentAuditorId, reqVO.getCurrentAuditorId())
                 .eqIfPresent(ReportCityRecordDO::getEquipMainType, reqVO.getEquipMainType())

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/AcceptOrderServiceImpl.java

@@ -79,6 +79,7 @@ import org.springframework.validation.annotation.Validated;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -452,9 +453,41 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
                 in(BoilerAcceptOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
         );
 
+        //修改设备数量
         Long size = acceptOrderItemMapper.selectCount(BoilerAcceptOrderItemDO::getOrderId,acceptOrderDO.getId());
         acceptOrderDO.setEquipNum(Math.toIntExact(size));
-        acceptOrderMapper.updateById(acceptOrderDO);
+        AcceptOrderDO updateOrder = new AcceptOrderDO();
+        if(size == null || size == 0){
+            updateOrder.setStatus(500);
+            updateOrder.setEquipNum(0);
+            //修改费用
+            updateOrder.setShouldAmount(BigDecimal.ZERO);
+            updateOrder.setActualAmount(BigDecimal.ZERO);
+            updateOrder.setReduceFee(BigDecimal.ZERO);
+            updateOrder.setServiceAmount(BigDecimal.ZERO);
+        }else {
+            updateOrder.setEquipNum(Math.toIntExact(size));
+            //修改费用
+            if (acceptOrderDO.getEquipNum() > Math.toIntExact(size)) {
+                // 先除以equipNum，再乘count计算金额
+                BigDecimal equipNum = new BigDecimal(acceptOrderDO.getEquipNum());
+                BigDecimal currentCount = new BigDecimal(size);
+                updateOrder.setShouldAmount(acceptOrderDO.getShouldAmount()
+                        .divide(equipNum, 2, RoundingMode.HALF_UP)
+                        .multiply(currentCount));
+                updateOrder.setActualAmount(acceptOrderDO.getActualAmount()
+                        .divide(equipNum, 2, RoundingMode.HALF_UP)
+                        .multiply(currentCount));
+                updateOrder.setReduceFee(acceptOrderDO.getReduceFee()
+                        .divide(equipNum, 2, RoundingMode.HALF_UP)
+                        .multiply(currentCount));
+                updateOrder.setServiceAmount(acceptOrderDO.getServiceAmount()
+                        .divide(equipNum, 2, RoundingMode.HALF_UP)
+                        .multiply(currentCount));
+            }
+            acceptOrderMapper.updateById(acceptOrderDO);
+        }
+
     }
 
     @Override

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/PipeAcceptOrderServiceImpl.java

@@ -86,6 +86,7 @@ import org.springframework.validation.annotation.Validated;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -1185,9 +1186,37 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
         AcceptOrderDO updateOrder = new AcceptOrderDO();
         updateOrder.setId(orderId);
         if(count == null || count == 0){
+            updateOrder.setEquipNum(0);
             updateOrder.setStatus(500);
+            //修改费用
+            updateOrder.setShouldAmount(BigDecimal.ZERO);
+            updateOrder.setActualAmount(BigDecimal.ZERO);
+            updateOrder.setReduceFee(BigDecimal.ZERO);
+            updateOrder.setServiceAmount(BigDecimal.ZERO);
         }else{
             updateOrder.setEquipNum(Math.toIntExact(count));
+            //修改费用
+            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(orderId);
+            if (acceptOrderDO != null) {
+                if (acceptOrderDO.getEquipNum() > Math.toIntExact(count)){
+                    // 先除以equipNum，再乘count计算金额
+                    BigDecimal equipNum = new BigDecimal(acceptOrderDO.getEquipNum());
+                    BigDecimal currentCount = new BigDecimal(count);
+                    updateOrder.setShouldAmount(acceptOrderDO.getShouldAmount()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                    updateOrder.setActualAmount(acceptOrderDO.getActualAmount()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                    updateOrder.setReduceFee(acceptOrderDO.getReduceFee()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                    updateOrder.setServiceAmount(acceptOrderDO.getServiceAmount()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                }
+            }
+
         }
         acceptOrderMapper.updateById(updateOrder);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/AppointmentConfirmOrderServiceImpl.java

@@ -708,6 +708,11 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
         Long count = appointmentConfirmOrderItemMapper.selectCount(BoilerAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId());
         if (count != null) {
             appointmentConfirmOrderMapper.updateById(new AppointmentConfirmOrderDO().setId(appointmentRefuseVO.getOrderId()).setEquipNumBoiler(count.intValue()));
+        }else{
+            appointmentConfirmOrderMapper.updateById(new AppointmentConfirmOrderDO()
+                    .setId(appointmentRefuseVO.getOrderId())
+                    .setEquipNumBoiler(0)
+                    .setStatus(500));
         }
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/PipeAppointmentConfirmOrderServiceImpl.java

@@ -98,6 +98,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -1332,6 +1333,27 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
             updateOrder.setStatus(500);
         }else{
             updateOrder.setEquipNumBoiler(Math.toIntExact(count));
+            //修改费用
+            AppointmentConfirmOrderDO appointmentConfirmOrderDO = appointmentConfirmOrderMapper.selectById(orderId);
+            if (appointmentConfirmOrderDO != null) {
+                if (appointmentConfirmOrderDO.getEquipNumBoiler() > Math.toIntExact(count)){
+                    // 先除以equipNum，再乘count计算金额
+                    BigDecimal equipNum = new BigDecimal(appointmentConfirmOrderDO.getEquipNumBoiler());
+                    BigDecimal currentCount = new BigDecimal(count);
+                    updateOrder.setShouldAmount(appointmentConfirmOrderDO.getShouldAmount()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                    updateOrder.setActualAmount(appointmentConfirmOrderDO.getActualAmount()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                    updateOrder.setReduceFee(appointmentConfirmOrderDO.getReduceFee()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                    updateOrder.setServiceAmount(appointmentConfirmOrderDO.getServiceAmount()
+                            .divide(equipNum, 2, RoundingMode.HALF_UP)
+                            .multiply(currentCount));
+                }
+            }
         }
         appointmentConfirmOrderMapper.updateById(updateOrder);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -1889,9 +1889,6 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         return true;
     }
 
-    @Resource
-    private PipeTaskOrderService boilerTaskOrderService;
-
     @Transactional
     @Override
     public Boolean audit(String id, Integer status, String reason) {
@@ -2221,6 +2218,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         taskOrderItem.setTaskStatus(taskOrderDO.getTaskStatus());
         boilerTaskOrderItemMapper.update(taskOrderItem, new LambdaUpdateWrapper<BoilerTaskOrderItemDO>().eq(BoilerTaskOrderItemDO::getOrderId, id));
 
+        //修改金额
+        this.updateOrderFee(id);
+
     }
     @Resource
     private UserWallThicknessTemplateService userWallThicknessTemplateService;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemsuspend/BoilerTaskOrderItemSuspendServiceImpl.java

@@ -331,10 +331,11 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
                     fee.set(add);
                 }
             });
-            log.info("任务单{}，重新计算服务费用{}", taskOrderDO.getId(), fee);
+//            log.info("任务单{}，重新计算服务费用{}", taskOrderDO.getId(), fee);
             BoilerTaskOrderDO updateOrder = new BoilerTaskOrderDO();
             updateOrder.setId(taskOrderDO.getId());
-            updateOrder.setServiceAmount(fee.get());
+            updateOrder.setEquipNum(taskOrderItemDOS.size());
+//            updateOrder.setServiceAmount(fee.get());
 
             //如果只剩下一台并且状态为报告办结则任务单直接办结
 //            if (Integer.valueOf(1).equals(taskOrderItemDOS.size()) && TaskOrderStatusEnum.REPORT_FINISH.getStatus().equals(taskOrderItemDOS.get(0).getTaskStatus())) {
@@ -375,6 +376,10 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
             }
 
             taskOrderMapper.updateById(updateOrder);
+
+            //修改金额
+            taskOrderService.updateOrderFee(updateOrder.getId());
+
         } else {
             // log.info("任务单{}，所有设备都挂起，删除任务单",taskOrderDO.getId());
             BoilerTaskOrderDO updateObj = new BoilerTaskOrderDO();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -1961,6 +1961,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         taskOrderItem.setTaskStatus(taskOrderDO.getTaskStatus());
         pipeTaskOrderItemMapper.update(taskOrderItem, new LambdaUpdateWrapper<PipeTaskOrderItemDO>().eq(PipeTaskOrderItemDO::getOrderId, id));
 
+        //修改金额
+        this.updateOrderFee(id);
+        
     }
 
     @Override

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemsuspend/PipeTaskOrderItemSuspendServiceImpl.java

@@ -1,21 +1,17 @@
 package cn.start.tz.module.pressure2.service.pipetaskorderitemsuspend;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.start.tz.module.pressure.enums.EnvConstants;
 import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
-import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo.BoilerTaskOrderItemSuspendRespVO;
-import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo.TaskOrderItemSuspendSubmitReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmorderrefuseitem.AppointmentConfirmOrderRefuseItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmrefuseyearitem.AppointmentConfirmRefuseYearItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipeschedulingitem.EquipPipeSchedulingItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemdetail.PipeTaskOrderItemDetailDO;
-import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.mysql.appointmentconfirmorderrefuseitem.AppointmentConfirmOrderRefuseItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.appointmentconfirmrefuseyearitem.AppointmentConfirmRefuseYearItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
@@ -29,7 +25,6 @@ import cn.start.tz.module.pressure2.framework.thread.CommonThread;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.pressure2.service.pipetaskorderissuereport.PipeTaskOrderIssueReportService;
 import cn.start.tz.module.pressure2.service.taskordernontaxapply.TaskOrderNonTaxApplyService;
-import cn.start.tz.module.pressure2.service.taskordernontaxapply.vo.TaskOrderNonTaxApplyCreateVO;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -45,11 +40,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -57,7 +50,6 @@ import java.util.stream.Collectors;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemsuspend.PipeTaskOrderItemSuspendDO;
 import cn.start.tz.framework.common.pojo.PageResult;
-import cn.start.tz.framework.common.pojo.PageParam;
 import cn.start.tz.framework.common.util.object.BeanUtils;
 
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemsuspend.PipeTaskOrderItemSuspendMapper;
@@ -190,6 +182,7 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
             return;
         }
 
+        AtomicReference<String> orderId = new AtomicReference<>("");
         // 按照 equipPipeId 进行分组
         List<PipeTaskOrderItemSuspendDO> taskOrderItemSuspendDOS = new ArrayList<>();
         Map<String, List<PipeTaskOrderItemSuspendDetailReqVO>> groupedByEquipPipeIds = submitReqVO.getOrderItemDetails().stream()
@@ -200,6 +193,7 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
         groupedByEquipPipeIds.forEach((equipPipeId, orderItemDetails) -> {
 
             PipeTaskOrderItemDO taskOrderItemDO = taskOrderItemMapper.selectById(equipPipeId);
+            orderId.set(taskOrderItemDO.getOrderId());
             PipeTaskOrderDO taskOrderDO = taskOrderMapper.selectById(taskOrderItemDO.getOrderId());
             List<AppointmentConfirmOrderRefuseItemDO> refuseItemDOList = new ArrayList<>();
 
@@ -339,6 +333,20 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
 
         pipeTaskOrderItemSuspendMapper.insertBatch(taskOrderItemSuspendDOS);
 
+        //判断任务单是否没有设备
+        PipeTaskOrderDO updateDO = new PipeTaskOrderDO();
+        updateDO.setId(orderId.get());
+        Long count = taskOrderItemMapper.selectCount(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
+                .eq(PipeTaskOrderItemDO::getOrderId, orderId.get()));
+        if (count == null || count == 0){
+            updateDO.setTaskStatus(TaskOrderStatusEnum.CANCEL.getStatus());
+        }else{
+            updateDO.setEquipNum(Math.toIntExact(count));
+            //修改金额
+            taskOrderService.updateOrderFee(orderId.get());
+        }
+        taskOrderMapper.updateById(updateDO);
+
     }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxapply/TaskOrderNonTaxApplyServiceImpl.java

@@ -898,15 +898,15 @@ public class TaskOrderNonTaxApplyServiceImpl extends ServiceImpl<TaskOrderNonTax
                     }
                 }
 
-                if (x.getServiceAmount() == null) {
-                    x.setActualAmount(BigDecimal.ZERO);
-                } else if ((x.getCheckType() != null && x.getCheckType() != 100) || x.getReductionRadio() == null) {
-                    x.setActualAmount(x.getServiceAmount());
-                } else {
-                    double v = 1 - x.getReductionRadio().doubleValue();
-                    BigDecimal num = x.getServiceAmount().multiply(new BigDecimal(v));
-                    x.setActualAmount(num.setScale(2, RoundingMode.HALF_UP));
-                }
+//                if (x.getServiceAmount() == null) {
+//                    x.setActualAmount(BigDecimal.ZERO);
+//                } else if ((x.getCheckType() != null && x.getCheckType() != 100) || x.getReductionRadio() == null) {
+//                    x.setActualAmount(x.getServiceAmount());
+//                } else {
+//                    double v = 1 - x.getReductionRadio().doubleValue();
+//                    BigDecimal num = x.getServiceAmount().multiply(new BigDecimal(v));
+//                    x.setActualAmount(num.setScale(2, RoundingMode.HALF_UP));
+//                }
 
                 x.setNonTaxApplyCreatorUser(finalUserMap1.get(x.getNonTaxApplyCreator()));
             });