财务结算提交

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -272,7 +272,16 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			{
 				throw new SecurityException("撤销账单失败,原业务表已收金额为空");
 			}
-			client.setSettlmentAmount(client.getSettlmentAmount().subtract(items.getThisAmount()));
+			//如果是人民币修改原
+			if(items.getCurrency().equals("CNY"))
+			{
+				client.setSettlmentAmount(client.getSettlmentAmount()!=null?client.getSettlmentAmount().subtract(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+			}
+			//如果是外币
+			else
+			{
+				client.setForeignSettlmentAmount(client.getForeignSettlmentAmount()!=null?client.getForeignSettlmentAmount().subtract(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+			}
 			orderDescClient.updateOrder(client);
 		}
 		//修改费用明细
@@ -339,7 +348,16 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			{
 				throw new SecurityException("修改原单据失败");
 			}
-			client.setSettlmentAmount(client.getSettlmentAmount()!=null?client.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+			//如果是人民币,修改人民结算字段
+			if(items.getCurrency().equals("CNY"))
+			{
+				client.setSettlmentAmount(client.getSettlmentAmount()!=null?client.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+			}
+			//如果是外币
+			else
+			{
+				client.setForeignSettlmentAmount(client.getForeignSettlmentAmount()!=null?client.getForeignSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+			}
 			orderDescClient.updateOrder(client);
 
 		}