diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java index 3a50dd7..7faac11 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java @@ -277,7 +277,7 @@ public class AliPayService extends BasePayService { for (Map.Entry entry : orderInfo.entrySet()) { Object o = entry.getValue(); - if (null == o || "null".equals(o) || "".equals(o)) { + if (StringUtils.isEmpty((String)o) || "null".equals(o) ) { continue; } formHtml.append(""); diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java index f27bba1..f9d1873 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java @@ -133,7 +133,7 @@ public abstract class BasePayService implements Pay Map params = new TreeMap(); for (Map.Entry entry : parameterMap.entrySet()) { - String name = (String) entry.getKey(); + String name = entry.getKey(); String[] values = entry.getValue(); String valueStr = ""; for (int i = 0,len = values.length; i < len; i++) { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java index e5be3f2..287c9ae 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java @@ -88,7 +88,7 @@ public class UriVariables { public static String getMapToParameters(Map pe){ StringBuilder builder = new StringBuilder(); for (Map.Entry entry : (Set)pe.entrySet()) { - Object o = entry.getKey(); + Object o = entry.getValue(); if (null == o) { continue; diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java index 3d2cdde..3885979 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java @@ -433,12 +433,9 @@ public class UnionPayService extends BasePayService { sf.append(""); sf.append("
"); if (null != orderInfo && 0 != orderInfo.size()) { - Set> set = orderInfo.entrySet(); - Iterator> it = set.iterator(); - while (it.hasNext()) { - Map.Entry ey = it.next(); - String key = ey.getKey(); - Object value = ey.getValue(); + for ( Map.Entry entry: orderInfo.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); sf.append(""); } }