Merge remote-tracking branch 'origin/dev' into dev

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

@@ -629,7 +629,11 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			if (acc.getSettlementAmount() == null) {
 				throw new SecurityException("撤销账单失败,结算金额为空");
 			}
-			acc.setSettlementAmount(acc.getSettlementAmount().subtract(items.getThisAmount()));
+			if (items.getThisAmount().compareTo(new BigDecimal("0.00")) == 0) {
+				acc.setSettlementAmount(acc.getSettlementAmount().subtract(items.getMemberBalance()));
+			}else{
+				acc.setSettlementAmount(acc.getSettlementAmount().subtract(items.getThisAmount()));
+			}
 			//判断是否退款,已收金额为负数
 			BigDecimal settlementAmount = acc.getSettlementAmount();
 			if (settlementAmount.compareTo(new BigDecimal("0")) < 0) {