问题调整

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

@@ -2712,7 +2712,13 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         updateObj.setTaskStatus(TaskOrderStatusEnum.CANCEL.getStatus());
         updateObj.setStatus(400);
         updateObj.setReturnReason(orderItemRatifyVO.getReason());
-        String boilerTaskOrderReportDOId = taskOrderItemReportMapper.selectById(orderItemRatifyVO.getId()).getOrderId();
+
+        String boilerTaskOrderReportDOId = "";
+        BoilerTaskOrderItemReportDO OrderFeeBean = taskOrderItemReportMapper.selectById(orderItemRatifyVO.getId());
+        if (OrderFeeBean != null){
+            boilerTaskOrderReportDOId = taskOrderItemReportMapper.selectById(orderItemRatifyVO.getId()).getOrderId();
+        }
+
         if (orderItemRatifyVO.getReportType() != null && orderItemRatifyVO.getReportType() == TaskOrderItemReportTypeEnum.INSPECTION_PLAN.getType().intValue()) {
             BoilerTaskOrderReportDO reportDO = taskOrderReportMapper.selectById(orderItemRatifyVO.getId());
             BoilerTaskOrderReportDO bean = BeanUtils.toBean(updateObj, BoilerTaskOrderReportDO.class);
@@ -2756,7 +2762,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         taskOrderItemReportRecordDO.setResult(100);
         taskOrderItemReportRecordDO.setRemark(orderItemRatifyVO.getReason());
         taskOrderItemReportRecordMapper.insert(taskOrderItemReportRecordDO);
-        this.updateOrderFee(boilerTaskOrderReportDOId);
+        if (StringUtils.isNotEmpty(boilerTaskOrderReportDOId)){
+            this.updateOrderFee(boilerTaskOrderReportDOId);
+        }
     }
 
     @Override

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

@@ -1320,7 +1320,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 addReport.setTaskStatus(TaskOrderStatusEnum.ENTER.getStatus());
                 addReport.setSort(count + 1 + i);
                 addReport.setFeeType(vo.getType());
-                
+
                 // 计算当前是第几个（从 1 开始）
                 int currentIndex = existingTemplateCount + i + 1;
                 
@@ -1768,38 +1768,20 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(id);
             // 免征
             boolean isExempt = 300 == pipeTaskOrderDO.getFeeNature();
-            BigDecimal shouldAmount = new BigDecimal(0);
-            BigDecimal reduceFee = new BigDecimal(0);
-            BigDecimal serviceAmount = new BigDecimal(0);
             BigDecimal orderFee = new BigDecimal(0);
             for (PipeTaskOrderItemReportDO reportDO : reportDOList) {
                 if (reportDO.getFee() != null) {
                     // 免征不收法定收费
                     if (isExempt && "1".equals(reportDO.getFeeType())) {
-                        reduceFee = reduceFee.add(reportDO.getFee());
                         continue;
                     }
                     orderFee = orderFee.add(reportDO.getFee());
-                    if (isExempt && "2".equals(reportDO.getFeeType())) {
-                        serviceAmount = serviceAmount.add(reportDO.getFee());
-                        continue;
-                    }
-                    if (!isExempt && "1".equals(reportDO.getFeeType())) {
-                        shouldAmount = shouldAmount.add(reportDO.getFee());
-                    }
                 }
             }
             PipeTaskOrderDO taskOrderDO = new PipeTaskOrderDO();
             taskOrderDO.setId(id);
             taskOrderDO.setActualAmount(orderFee);
             pipeTaskOrderMapper.updateById(taskOrderDO);
-
-            String acceptOrderId = pipeTaskOrderDO.getAcceptOrderId();
-            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
-            acceptOrderDO.setServiceAmount(serviceAmount);
-            acceptOrderDO.setShouldAmount(shouldAmount);
-            acceptOrderDO.setReduceFee(reduceFee);
-            acceptOrderMapper.updateById(acceptOrderDO);
         }
 
     }