合并bug

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

@@ -1768,20 +1768,38 @@ 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);
         }
 
     }