退款结果集统一处理

pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java

@@ -263,7 +263,7 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
     @Override
     public <T> T refund(RefundOrder refundOrder, Callback<T> callback) {
 
-        return callback.perform(refund(refundOrder));
+        return callback.perform(refund(refundOrder).getAttrs());
     }
 
 

pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java

@@ -252,7 +252,7 @@ public interface PayService<PC extends PayConfigStorage> {
      * @param refundOrder 退款订单信息
      * @return 返回支付方申请退款后的结果
      */
-    Map<String, Object> refund(RefundOrder refundOrder);
+    RefundResult refund(RefundOrder refundOrder);
 
     /**
      * 申请退款接口

pay-java-common/src/main/java/com/egzosn/pay/common/bean/BaseRefundResult.java

@@ -0,0 +1,337 @@
+package com.egzosn.pay.common.bean;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 基础的退款结果对象
+ *
+ * @author Egan
+ * <pre>
+ * email egzosn@gmail.com
+ * date 2020/8/16 19:29
+ * </pre>
+ */
+public abstract class BaseRefundResult implements RefundResult {
+
+    /**
+     * 属性集，支付宝退款结果
+     */
+    private Map<String, Object> attrs;
+
+
+    public BaseRefundResult() {
+    }
+
+    public BaseRefundResult(Map<String, Object> attrs) {
+        this.attrs = attrs;
+
+    }
+
+    /**
+     * 获取退款结果原信息集
+     *
+     * @return 属性
+     */
+    @Override
+    public Map<String, Object> getAttrs() {
+        return attrs;
+    }
+
+    public void setAttrs(Map<String, Object> attrs) {
+        this.attrs = attrs;
+    }
+
+    /**
+     * 获取退款结果属性值
+     *
+     * @param key 属性名
+     * @return 属性
+     */
+    @Override
+    public Object getAttr(String key) {
+        return attrs.get(key);
+    }
+
+    /**
+     * 获取退款结果属性值
+     *
+     * @param key 属性名
+     * @return 属性值
+     */
+    @Override
+    public String getAttrString(String key) {
+        return attrs.get(key).toString();
+    }
+
+    /**
+     * 获取退款结果属性值
+     *
+     * @param key 属性名
+     * @return 属性值
+     */
+    @Override
+    public BigDecimal getAttrDecimal(String key) {
+        return new BigDecimal(getAttrString(key));
+    }
+
+    /**
+     * Returns the number of key-value mappings in this map.  If the
+     * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+     * <tt>Integer.MAX_VALUE</tt>.
+     *
+     * @return the number of key-value mappings in this map
+     */
+    @Override
+    public int size() {
+        return attrs.size();
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map contains no key-value mappings.
+     *
+     * @return <tt>true</tt> if this map contains no key-value mappings
+     */
+    @Override
+    public boolean isEmpty() {
+        return attrs.isEmpty();
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map contains a mapping for the specified
+     * key.  More formally, returns <tt>true</tt> if and only if
+     * this map contains a mapping for a key <tt>k</tt> such that
+     * <tt>(key==null ? k==null : key.equals(k))</tt>.  (There can be
+     * at most one such mapping.)
+     *
+     * @param key key whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map contains a mapping for the specified
+     * key
+     * @throws ClassCastException   if the key is of an inappropriate type for
+     *                              this map
+     *                              (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified key is null and this map
+     *                              does not permit null keys
+     *                              (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     */
+    @Override
+    public boolean containsKey(Object key) {
+        return attrs.containsKey(key);
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map maps one or more keys to the
+     * specified value.  More formally, returns <tt>true</tt> if and only if
+     * this map contains at least one mapping to a value <tt>v</tt> such that
+     * <tt>(value==null ? v==null : value.equals(v))</tt>.  This operation
+     * will probably require time linear in the map size for most
+     * implementations of the <tt>Map</tt> interface.
+     *
+     * @param value value whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map maps one or more keys to the
+     * specified value
+     * @throws ClassCastException   if the value is of an inappropriate type for
+     *                              this map
+     *                              (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified value is null and this
+     *                              map does not permit null values
+     *                              (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     */
+    @Override
+    public boolean containsValue(Object value) {
+        return attrs.containsValue(value);
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped,
+     * or {@code null} if this map contains no mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key
+     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
+     * key.equals(k))}, then this method returns {@code v}; otherwise
+     * it returns {@code null}.  (There can be at most one such mapping.)
+     *
+     * <p>If this map permits null values, then a return value of
+     * {@code null} does not <i>necessarily</i> indicate that the map
+     * contains no mapping for the key; it's also possible that the map
+     * explicitly maps the key to {@code null}.  The {@link #containsKey
+     * containsKey} operation may be used to distinguish these two cases.
+     *
+     * @param key the key whose associated value is to be returned
+     * @return the value to which the specified key is mapped, or
+     * {@code null} if this map contains no mapping for the key
+     * @throws ClassCastException   if the key is of an inappropriate type for
+     *                              this map
+     *                              (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified key is null and this map
+     *                              does not permit null keys
+     *                              (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     */
+    @Override
+    public Object get(Object key) {
+        return attrs.get(key);
+    }
+
+    /**
+     * Associates the specified value with the specified key in this map
+     * (optional operation).  If the map previously contained a mapping for
+     * the key, the old value is replaced by the specified value.  (A map
+     * <tt>m</tt> is said to contain a mapping for a key <tt>k</tt> if and only
+     * if {@link #containsKey(Object) m.containsKey(k)} would return
+     * <tt>true</tt>.)
+     *
+     * @param key   key with which the specified value is to be associated
+     * @param value value to be associated with the specified key
+     * @return the previous value associated with <tt>key</tt>, or
+     * <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     * (A <tt>null</tt> return can also indicate that the map
+     * previously associated <tt>null</tt> with <tt>key</tt>,
+     * if the implementation supports <tt>null</tt> values.)
+     * @throws UnsupportedOperationException if the <tt>put</tt> operation
+     *                                       is not supported by this map
+     * @throws ClassCastException            if the class of the specified key or value
+     *                                       prevents it from being stored in this map
+     * @throws NullPointerException          if the specified key or value is null
+     *                                       and this map does not permit null keys or values
+     * @throws IllegalArgumentException      if some property of the specified key
+     *                                       or value prevents it from being stored in this map
+     */
+    @Override
+    public Object put(String key, Object value) {
+        return attrs.put(key, value);
+    }
+
+    /**
+     * Removes the mapping for a key from this map if it is present
+     * (optional operation).   More formally, if this map contains a mapping
+     * from key <tt>k</tt> to value <tt>v</tt> such that
+     * <code>(key==null ?  k==null : key.equals(k))</code>, that mapping
+     * is removed.  (The map can contain at most one such mapping.)
+     *
+     * <p>Returns the value to which this map previously associated the key,
+     * or <tt>null</tt> if the map contained no mapping for the key.
+     *
+     * <p>If this map permits null values, then a return value of
+     * <tt>null</tt> does not <i>necessarily</i> indicate that the map
+     * contained no mapping for the key; it's also possible that the map
+     * explicitly mapped the key to <tt>null</tt>.
+     *
+     * <p>The map will not contain a mapping for the specified key once the
+     * call returns.
+     *
+     * @param key key whose mapping is to be removed from the map
+     * @return the previous value associated with <tt>key</tt>, or
+     * <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+     *                                       is not supported by this map
+     * @throws ClassCastException            if the key is of an inappropriate type for
+     *                                       this map
+     *                                       (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException          if the specified key is null and this
+     *                                       map does not permit null keys
+     *                                       (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+     */
+    @Override
+    public Object remove(Object key) {
+        return attrs.remove(key);
+    }
+
+    /**
+     * Copies all of the mappings from the specified map to this map
+     * (optional operation).  The effect of this call is equivalent to that
+     * of calling {@link #put(Object, Object) put(k, v)} on this map once
+     * for each mapping from key <tt>k</tt> to value <tt>v</tt> in the
+     * specified map.  The behavior of this operation is undefined if the
+     * specified map is modified while the operation is in progress.
+     *
+     * @param m mappings to be stored in this map
+     * @throws UnsupportedOperationException if the <tt>putAll</tt> operation
+     *                                       is not supported by this map
+     * @throws ClassCastException            if the class of a key or value in the
+     *                                       specified map prevents it from being stored in this map
+     * @throws NullPointerException          if the specified map is null, or if
+     *                                       this map does not permit null keys or values, and the
+     *                                       specified map contains null keys or values
+     * @throws IllegalArgumentException      if some property of a key or value in
+     *                                       the specified map prevents it from being stored in this map
+     */
+    @Override
+    public void putAll(Map<? extends String, ?> m) {
+        attrs.putAll(m);
+    }
+
+    /**
+     * Removes all of the mappings from this map (optional operation).
+     * The map will be empty after this call returns.
+     *
+     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+     *                                       is not supported by this map
+     */
+    @Override
+    public void clear() {
+        attrs.clear();
+    }
+
+    /**
+     * Returns a {@link Set} view of the keys contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation), the results of
+     * the iteration are undefined.  The set supports element removal,
+     * which removes the corresponding mapping from the map, via the
+     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
+     * operations.
+     *
+     * @return a set view of the keys contained in this map
+     */
+    @Override
+    public Set<String> keySet() {
+        return attrs.keySet();
+    }
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map.
+     * The collection is backed by the map, so changes to the map are
+     * reflected in the collection, and vice-versa.  If the map is
+     * modified while an iteration over the collection is in progress
+     * (except through the iterator's own <tt>remove</tt> operation),
+     * the results of the iteration are undefined.  The collection
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
+     * support the <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @return a collection view of the values contained in this map
+     */
+    @Override
+    public Collection<Object> values() {
+        return attrs.values();
+    }
+
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation, or through the
+     * <tt>setValue</tt> operation on a map entry returned by the
+     * iterator) the results of the iteration are undefined.  The set
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
+     * <tt>clear</tt> operations.  It does not support the
+     * <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @return a set view of the mappings contained in this map
+     */
+    @Override
+    public Set<Entry<String, Object>> entrySet() {
+        return attrs.entrySet();
+    }
+}

pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original  egan.
+ * Copyright 2017 the original  egan.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

pay-java-common/src/main/java/com/egzosn/pay/common/bean/Order.java

@@ -1,5 +1,6 @@
 package com.egzosn.pay.common.bean;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -11,7 +12,7 @@ import java.util.Map;
  *      date 2020/01/05 13:34
  *  </pre>
  */
-public interface Order {
+public interface Order  extends Serializable {
 
     /**
      * 获取订单属性 这里可用做覆盖已设置的订单信息属性，订单信息在签名前进行覆盖。

pay-java-common/src/main/java/com/egzosn/pay/common/bean/RefundResult.java

@@ -0,0 +1,103 @@
+package com.egzosn.pay.common.bean;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 退款结果
+ *
+ * 这里继承Map为兼容方案，后续版本进行删除
+ * @author Egan
+ * <pre>
+ * email egzosn@gmail.com
+ * date 2020/8/16 9:55
+ * </pre>
+ */
+public interface RefundResult extends Map<String, Object>, Serializable {
+    /**
+     * 获取退款结果原信息集
+     *
+     * @return 属性
+     */
+    Map<String, Object> getAttrs();
+
+    /**
+     * 获取退款结果属性值
+     *
+     * @param key 属性名
+     * @return 属性值
+     */
+    Object getAttr(String key);
+    /**
+     * 获取退款结果属性值
+     *
+     * @param key 属性名
+     * @return 属性值
+     */
+    String getAttrString(String key);
+    /**
+     * 获取退款结果属性值
+     *
+     * @param key 属性名
+     * @return 属性值
+     */
+    BigDecimal getAttrDecimal(String key);
+
+
+    /**
+     * 获取退款请求结果状态码
+     * @return 状态码
+     */
+    String getCode();
+
+    /**
+     * 获取退款请求结果状态提示信息
+     * @return 提示信息
+     */
+    String getMsg();
+
+    /**
+     * 返回业务结果状态码
+     * @return 业务结果状态码
+     */
+    String getResultCode();
+
+    /**
+     * 返回业务结果状态提示信息
+     * @return 业务结果状态提示信息
+     */
+    String getResultMsg();
+
+    /**
+     * 退款金额
+     * @return 退款金额
+     */
+    BigDecimal getRefundFee();
+    /**
+     * 退款币种信息
+     * @return 币种信息
+     */
+    CurType getRefundCurrency();
+
+    /**
+     *  支付平台交易号
+     *  发起支付时 支付平台(如支付宝)返回的交易订单号
+     *
+     * @return 支付平台交易号
+     */
+    String getTradeNo();
+
+    /**
+     * 支付订单号
+     * 发起支付时，用户系统的订单号
+     * @return 支付订单号
+     */
+    String getOutTradeNo();
+
+    /**
+     * 商户退款单号
+     * @return 商户退款单号
+     */
+    String getRefundNo();
+}

pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java

@@ -352,9 +352,4 @@ public class XML {
     }
 
 
-    public static void main(String[] args) {
-        String text = "<datas><data><code>0</code><users><user><id>1</id><name>张三</name></user><user><id>2</id><name>张4</name></user></users></data></datas>";
-        System.out.println( getMap2Xml(toJSONObject(text), "datas", "utf-8"));
-
-    }
 }