Browse Source

2025年4月21日17:30:23

纪新园 7 months ago
parent
commit
3d90ab63a3

+ 5 - 0
blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/report/AgentFeeReport.java

@@ -159,5 +159,10 @@ public class AgentFeeReport implements Serializable {
 	 */
 	private BigDecimal realityTariff;
 
+	/**
+	 * 剩余
+	 */
+	private BigDecimal blcAmount;
+
 
 }

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

@@ -3835,6 +3835,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					agentFeeReport.setReportSumAmount(new BigDecimal("0.00"));
 					agentFeeReport.setRealitySumAmount(new BigDecimal("0.00"));
 				}
+				agentFeeReport.setBlcAmount(agentFeeReport.getSumAmount().subtract(agentFeeReport.getRemainingAmount())
+					.add(agentFeeReport.getBeforeRepairAmount()));
 				agentFeeReport.setDept(dept);
 				agentFeeReport.setReportList(reportList);
 				List<AgentFeeItemsReport> agentFeeItemsReports = new ArrayList<>();
@@ -4178,6 +4180,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					agentFeeReport.setReportSumAmount(new BigDecimal("0.00"));
 					agentFeeReport.setRealitySumAmount(new BigDecimal("0.00"));
 				}
+				agentFeeReport.setBlcAmount(agentFeeReport.getSumAmount().subtract(agentFeeReport.getRemainingAmount())
+					.add(agentFeeReport.getBeforeRepairAmount()));
 				agentFeeReport.setDept(dept);
 				agentFeeReport.setReportList(reportList);
 				List<AgentFeeItemsReport> agentFeeItemsReports = new ArrayList<>();