国内贸易财务收费修改

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/enums/SettlementEnum.java

@@ -0,0 +1,41 @@
+package org.springblade.finance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+@Getter
+@AllArgsConstructor
+public enum SettlementEnum {
+	/**
+	 * 增加溢付款
+	 */
+	ADD("add"),
+
+	/**
+	 * 撤销增加溢付款
+	 */
+	REPEALADD("repealAdd"),
+	/**
+	 * 消费溢付款
+	 */
+	REDUCE("reduce"),
+
+	/**
+	 * 撤销消费溢付款
+	 */
+	REPEALREDUCE("repealReduce"),
+
+	;
+	private final String status;
+
+	public static SettlementEnum fromType(String overpayment) {
+		for (SettlementEnum settlementEnum : SettlementEnum.values()) {
+			if (Objects.equals(settlementEnum.getStatus(), overpayment)) {
+				return settlementEnum;
+			}
+		}
+		throw new IllegalArgumentException("order status not exist");
+	}
+}

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Settlement.java

@@ -237,5 +237,15 @@ public class Settlement  implements Serializable {
 
 	@TableField(exist = false)
 	private String checkType;
+	/**
+	 * 溢付款
+	 */
+	@ApiModelProperty(value = "溢付款")
+	private BigDecimal overPayment;
+	/**
+	 * 本次溢付款
+	 */
+	@ApiModelProperty(value = "本次溢付款")
+	private BigDecimal caseOverPayment;
 
 }