君海：1.付汇通知金额计算逻辑修改

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -528,7 +528,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				if (ObjectUtils.isNotNull(agent.getFeeCenterListD()) && !agent.getFeeCenterListD().isEmpty()) {
 					agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge())
 						.subtract(agent.getFeeCenterListD().stream().filter(e -> "YFK".contains(e.getFeeCode()))
-							.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+							.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).abs()));
 				} else {
 					agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge()));
 				}
@@ -3783,6 +3783,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
 					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
 				}
+				BigDecimal ampuntSum = agentFeeReport.getRealitySumAmount();
 				agentFeeReport.setRealitySumAmount(agentFeeReport.getRealitySumAmount().add(agentFeeReport.getRealityOtherAmount())
 					.add(agentFeeReport.getRealityTariff()).add(agentFeeReport.getRealityTradeAgencyAmount())
 					.add(agentFeeReport.getRealityValueAddedTax()).add(agentFeeReport.getBeforeRepairAmount())
@@ -3793,7 +3794,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				agentFeeReport.setTariff(agent.getTariff());
 				agentFeeReport.setValueAddedTax(agent.getValueAddedTax());
 				agentFeeReport.setTradeAgencyAmount(agent.getTradeAgencyAmount());
-				agentFeeReport.setSumAmount(agent.getActualAmount().add(agent.getOtherAmount()).add(agent.getTariff())
+				agentFeeReport.setSumAmount(ampuntSum.add(agent.getOtherAmount()).add(agent.getTariff())
 					.add(agent.getValueAddedTax()).add(agent.getTradeAgencyAmount()).add(agentFeeReport.getBeforeRepairAmount())
 					.subtract(agentFeeReport.getRemainingAmount()));
 				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount()));
@@ -4133,6 +4134,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
 					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
 				}
+				BigDecimal ampuntSum = agentFeeReport.getRealitySumAmount();
 				agentFeeReport.setRealitySumAmount(agentFeeReport.getRealitySumAmount().add(agentFeeReport.getRealityOtherAmount())
 					.add(agentFeeReport.getRealityTariff()).add(agentFeeReport.getRealityTradeAgencyAmount())
 					.add(agentFeeReport.getRealityValueAddedTax()).add(agentFeeReport.getBeforeRepairAmount())
@@ -4143,7 +4145,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				agentFeeReport.setTariff(agent.getTariff());
 				agentFeeReport.setValueAddedTax(agent.getValueAddedTax());
 				agentFeeReport.setTradeAgencyAmount(agent.getTradeAgencyAmount());
-				agentFeeReport.setSumAmount(agent.getActualAmount().add(agent.getOtherAmount()).add(agent.getTariff())
+				agentFeeReport.setSumAmount(ampuntSum.add(agent.getOtherAmount()).add(agent.getTariff())
 					.add(agent.getValueAddedTax()).add(agent.getTradeAgencyAmount()).add(agentFeeReport.getBeforeRepairAmount())
 					.subtract(agentFeeReport.getRemainingAmount()));
 				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount()));