diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java index dd550be..57a6842 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java @@ -258,26 +258,20 @@ public class PayOrder implements Order { } @Override - public Map getAttrs() { + public Map getAttr() { if (null == attr){ attr = new HashMap<>(); } return attr; } - @Override - public Object getAttr(String key) { - return getAttrs().get(key); - } - - /** * 添加订单信息 * @param key key * @param value 值 */ public void addAttr(String key, Object value) { - getAttrs().put(key, value); + getAttr().put(key, value); } diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java index 83f05b8..2b89117 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java @@ -1,8 +1,6 @@ package com.egzosn.pay.common.bean; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; /** * 转账订单 @@ -12,7 +10,7 @@ import java.util.Map; * date 2018/1/31 * */ -public class TransferOrder implements Order { +public class TransferOrder { /** * 转账批次订单单号 @@ -81,12 +79,6 @@ public class TransferOrder implements Order { */ private String ip; - - /** - * 订单附加信息,可用于预设未提供的参数,这里会覆盖以上所有的订单信息, - */ - private Map attr; - public String getBatchNo() { return batchNo; } @@ -198,28 +190,4 @@ public class TransferOrder implements Order { public void setIp(String ip) { this.ip = ip; } - @Override - public Map getAttrs() { - if (null == attr){ - attr = new HashMap<>(); - } - return attr; - } - - @Override - public Object getAttr(String key) { - return getAttrs().get(key); - } - - - /** - * 添加订单信息 - * @param key key - * @param value 值 - */ - public void addAttr(String key, Object value) { - getAttrs().put(key, value); - } - - } diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index 896b184..d2a5c0d 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -86,7 +86,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10 + 2.9.10.1