添加项目

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

@@ -3407,11 +3407,15 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 }
             }
             // 金额发生变动，将受理单签名置空，判断全部金额都要和之前不一致
-            if (!"1".equals(boilerTaskOrderDO.getIsSync()) && ObjectUtil.notEqual(shouldAmount, boilerTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, boilerTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, boilerTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, boilerTaskOrderDO.getActualAmount())) {
-                orderReportService.updateFeeBoiler(id);
+            String acceptOrderId = boilerTaskOrderDO.getAcceptOrderId();
+            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
+            if (acceptOrderDO != null) {
+                if (ObjectUtil.notEqual(shouldAmount, boilerTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, boilerTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, boilerTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, boilerTaskOrderDO.getActualAmount())) {
+                    orderReportService.updateFeeBoiler(id);
 
-                // 金额发送变化
-                orderReportService.generateBoilerOrderReport(id);
+                    // 金额发送变化
+                    orderReportService.generateBoilerOrderReport(id);
+                }
             }
 
             BoilerTaskOrderDO taskOrderDO = new BoilerTaskOrderDO();
@@ -3422,8 +3426,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             taskOrderDO.setActualAmount(orderFee);
             boilerTaskOrderMapper.updateById(taskOrderDO);
 
-            String acceptOrderId = boilerTaskOrderDO.getAcceptOrderId();
-            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
+//            String acceptOrderId = boilerTaskOrderDO.getAcceptOrderId();
+//            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
             if (acceptOrderDO != null) {
                 acceptOrderDO.setServiceAmount(serviceAmount);
                 acceptOrderDO.setShouldAmount(shouldAmount);

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

@@ -2489,11 +2489,15 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 }
             }
             // 金额发生变动，将受理单签名置空，判断全部金额都要和之前不一致
-            if (!"1".equals(pipeTaskOrderDO.getIsSync()) && ObjectUtil.notEqual(shouldAmount, pipeTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, pipeTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, pipeTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, pipeTaskOrderDO.getActualAmount())) {
-                orderReportService.updateFeePipe(id);
+            String acceptOrderId = pipeTaskOrderDO.getAcceptOrderId();
+            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
+            if (acceptOrderDO != null) {
+                if (ObjectUtil.notEqual(shouldAmount, pipeTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, pipeTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, pipeTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, pipeTaskOrderDO.getActualAmount())) {
+                    orderReportService.updateFeePipe(id);
 
-                // 金额发送变化
-                orderReportService.generatePipeOrderReport(id);
+                    // 金额发送变化
+                    orderReportService.generatePipeOrderReport(id);
+                }
             }
 
             PipeTaskOrderDO taskOrderDO = new PipeTaskOrderDO();
@@ -2504,8 +2508,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             taskOrderDO.setActualAmount(orderFee);
             pipeTaskOrderMapper.updateById(taskOrderDO);
 
-            String acceptOrderId = pipeTaskOrderDO.getAcceptOrderId();
-            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
+//            String acceptOrderId = pipeTaskOrderDO.getAcceptOrderId();
+//            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(acceptOrderId);
             if (acceptOrderDO != null) {
                 acceptOrderDO.setServiceAmount(serviceAmount);
                 acceptOrderDO.setShouldAmount(shouldAmount);