版本升级，日志部分放至父类声明 ，代码优化

egzosn · egzosn · commit 6066a193e24d · 2018-11-15T10:12:57.000+08:00
diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.11.3</version>
+        <version>2.12.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-fuiou</artifactId>
diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java
@@ -7,9 +7,6 @@
 import com.egzosn.pay.common.http.UriVariables;
 import com.egzosn.pay.common.util.sign.SignUtils;
 import com.egzosn.pay.common.util.str.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -25,25 +22,41 @@
  * </pre>
  */
 public class FuiouPayService extends BasePayService<FuiouPayConfigStorage> {
-    //日志
-    protected final Log log = LogFactory.getLog(FuiouPayService.class);
-    //正式域名
-    public final static String URL_FuiouBaseDomain = "https://pay.fuiou.com/";
-    //测试域名
-    public final static String DEV_URL_FUIOUBASEDOMAIN = "http://www-1.fuiou.com:8888/wg1_run/";
-
-    //B2C/B2B支付
-    public final static String URL_FuiouSmpGate  = "smpGate.do";
-    //B2C/B2B支付(跨境支付)
-    public final static String URL_FuiouNewSmpGate = "newSmpGate.do";
-    //订单退款
-    public final static String URL_FuiouSmpRefundGate = "newSmpRefundGate.do";
-    //3.2	支付结果查询
-    public final static String URL_FuiouSmpQueryGate = "smpQueryGate.do";
-    //3.3	支付结果查询(直接返回)
-    public final static String URL_FuiouSmpAQueryGate = "smpAQueryGate.do";
-    //3.4订单退款
-    public final static String URL_NewSmpRefundGate = "newSmpRefundGate.do";
+
+    /**
+     * 正式域名
+     */
+    public static final String URL_FuiouBaseDomain = "https://pay.fuiou.com/";
+    /**
+     * 测试域名
+     */
+    public static final String DEV_URL_FUIOUBASEDOMAIN = "http://www-1.fuiou.com:8888/wg1_run/";
+
+    /**
+     * B2C/B2B支付
+     */
+    public static final String URL_FuiouSmpGate  = "smpGate.do";
+    /**
+     * B2C/B2B支付(跨境支付)
+     */
+    public static final String URL_FuiouNewSmpGate = "newSmpGate.do";
+    /**
+     * 订单退款
+     */
+    public static final String URL_FuiouSmpRefundGate = "newSmpRefundGate.do";
+    /**
+     * 3.2	支付结果查询
+     */
+    public static final String URL_FuiouSmpQueryGate = "smpQueryGate.do";
+    /**
+     * 3.3	支付结果查询(直接返回)
+     */
+    public static final String URL_FuiouSmpAQueryGate = "smpAQueryGate.do";
+    /**
+     * 3.4订单退款
+     */
+    public static final String URL_NewSmpRefundGate = "newSmpRefundGate.do";
+
 
     /**
      * 获取对应的请求地址
@@ -78,7 +91,7 @@ public FuiouPayService (FuiouPayConfigStorage payConfigStorage) {
     @Override
     public boolean verify(Map<String, Object> params) {
         if (!"0000".equals(params.get("order_pay_code"))) {
-            log.debug(String.format("富友支付异常：order_pay_code=%s,错误原因=%s,参数集=%s", params.get("order_pay_code"), params.get("order_pay_error"), params));
+            LOG.debug(String.format("富友支付异常：order_pay_code=%s,错误原因=%s,参数集=%s", params.get("order_pay_code"), params.get("order_pay_error"), params));
             return false;
         }
         try {
@@ -145,24 +158,36 @@ public Map<String, Object> orderInfo(PayOrder order) {
      */
     private LinkedHashMap<String, Object> getOrderInfo(PayOrder order) {
         LinkedHashMap<String, Object> parameters = new LinkedHashMap<String, Object>();
-        parameters.put("mchnt_cd", payConfigStorage.getPid());//商户代码
-        parameters.put("order_id", order.getOutTradeNo());//商户订单号
-        parameters.put("order_amt", order.getPrice().multiply(new BigDecimal(100)).setScale( 0, BigDecimal.ROUND_HALF_UP).intValue());//交易金额
-//        parameters.put("cur_type", null == order.getCurType() ? FuiouCurType.CNY:order.getCurType());//交易币种
-        parameters.put("order_pay_type", order.getTransactionType());//支付类型
-        parameters.put("page_notify_url", payConfigStorage.getReturnUrl());//商户接受支付结果通知地址
-        parameters.put("back_notify_url", StringUtils.isBlank(payConfigStorage.getNotifyUrl()) ? "" : payConfigStorage.getNotifyUrl());//商户接受的支付结果后台通知地址 //非必填
+        //商户代码
+        parameters.put("mchnt_cd", payConfigStorage.getPid());
+        //商户订单号
+        parameters.put("order_id", order.getOutTradeNo());
+        //交易金额
+        parameters.put("order_amt", order.getPrice().multiply(new BigDecimal(100)).setScale( 0, BigDecimal.ROUND_HALF_UP).intValue());
+        //交易币种
+//        parameters.put("cur_type", null == order.getCurType() ? FuiouCurType.CNY:order.getCurType());
+        //支付类型
+        parameters.put("order_pay_type", order.getTransactionType());
+        //商户接受支付结果通知地址
+        parameters.put("page_notify_url", payConfigStorage.getReturnUrl());
+        //商户接受的支付结果后台通知地址 //非必填
+        parameters.put("back_notify_url", StringUtils.isBlank(payConfigStorage.getNotifyUrl()) ? "" : payConfigStorage.getNotifyUrl());
 
         if (null != order.getExpirationTime()){
             parameters.put("order_valid_time", ((order.getExpirationTime().getTime() - System.currentTimeMillis())/1000/60 + "m"));
         }else {
-            parameters.put("order_valid_time", "30m");//超时时间 1m-15天，m：分钟、h：小时、d天、1c当天有效，
+            //超时时间 1m-15天，m：分钟、h：小时、d天、1c当天有效，
+            parameters.put("order_valid_time", "30m");
         }
-        parameters.put("iss_ins_cd", order.getBankType());//银行代码
+        //银行代码
+        parameters.put("iss_ins_cd", order.getBankType());
         parameters.put("goods_name", order.getSubject());
-        parameters.put("goods_display_url", "");//商品展示网址 //非必填
-        parameters.put("rem", "");//备注 //非必填
-        parameters.put("ver", "1.0.1");//版本号
+        //商品展示网址 //非必填
+        parameters.put("goods_display_url", "");
+        //备注 //非必填
+        parameters.put("rem", "");
+        //版本号
+        parameters.put("ver", "1.0.1");
         return parameters;
     }
 
@@ -287,9 +312,9 @@ private String getFormString(Map<String, Object> param, MethodType method,String
         formHtml.append(  "<form name=\"pay\" method=\""+method.name().toLowerCase()+"\" ");
         formHtml.append(  "action=\""+url+"\" id = \"form\">");
 
-        for (String key : param.keySet()) {
-            Object o = param.get(key);
-            formHtml.append("<input type=\"hidden\" value = '"+o+"' name=\""+key+"\"/>");
+        for (Map.Entry entry : param.entrySet()) {
+            Object o = entry.getValue();
+            formHtml.append("<input type=\"hidden\" value = '" + o + "' name=\"" + entry.getKey() + "\"/>");
         }
 
         formHtml.append("</form></body></html>");
@@ -311,8 +336,6 @@ public Map<String, Object> query(String tradeNo, String outTradeNo) {
         params.put("order_id", outTradeNo);
         params.put("md5", createSign(SignUtils.parameters2MD5Str(params, "|"), payConfigStorage.getInputCharset()));
         JSONObject resultJson = getHttpRequestTemplate().postForObject(getReqUrl() + URL_FuiouSmpAQueryGate + "?" + UriVariables.getMapToParameters(params), null, JSONObject.class);
-
-
         return resultJson;
     }
 
@@ -326,11 +349,12 @@ public Map<String, Object> query(String tradeNo, String outTradeNo) {
      */
     @Override
     public Map<String, Object> close(String tradeNo, String outTradeNo) {
-        return null;
+        return Collections.EMPTY_MAP;
     }
 
 
 
+
     /**
      * 申请退款接口
      *
@@ -355,17 +379,20 @@ public Map<String, Object> refund (String tradeNo, String outTradeNo, BigDecimal
      * @return 退款返回结果集
      */
     @Override
-    public Map<String, Object> refund (RefundOrder refundOrder) {
-        Map<String ,Object> params = new HashMap<>();
-        params.put("mchnt_cd",payConfigStorage.getPid());//商户代码
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        df.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-        params.put("origin_order_date",refundOrder.getOrderDate());//原交易日期
-        params.put("origin_order_id",refundOrder.getTradeNo());//原订单号
-        params.put("refund_amt",refundOrder.getRefundAmount().multiply(new BigDecimal(100)).setScale( 0, BigDecimal.ROUND_HALF_UP).intValue());//退款金额
-        params.put("rem","");//备注
-        params.put("md5",createSign(SignUtils.parameters2MD5Str(params,"|"),payConfigStorage.getInputCharset()));
-        JSONObject resultJson   = getHttpRequestTemplate().postForObject(getReqUrl() + URL_FuiouSmpRefundGate,params,JSONObject.class);
+    public Map<String, Object> refund(RefundOrder refundOrder) {
+        Map<String, Object> params = new HashMap<>();
+        //商户代码
+        params.put("mchnt_cd", payConfigStorage.getPid());
+        //原交易日期
+        params.put("origin_order_date", refundOrder.getOrderDate());
+        //原订单号
+        params.put("origin_order_id", refundOrder.getTradeNo());
+        //退款金额
+        params.put("refund_amt", refundOrder.getRefundAmount().multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP).intValue());
+        //备注
+        params.put("rem", "");
+        params.put("md5", createSign(SignUtils.parameters2MD5Str(params, "|"), payConfigStorage.getInputCharset()));
+        JSONObject resultJson = getHttpRequestTemplate().postForObject(getReqUrl() + URL_FuiouSmpRefundGate, params, JSONObject.class);
         return resultJson;
     }
 
diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.11.3</version>
+        <version>2.12.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-payoneer</artifactId>
diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java
@@ -84,7 +84,10 @@ public String getAuthorizationPage(String payeeId) {
         //设置 base atuh
         entity.setHeaders(authHeader());
         JSONObject response = getHttpRequestTemplate().postForObject(getReqUrl(PayoneerTransactionType.REGISTRATION), entity, JSONObject.class);
-        if (response != null && 0 == response.getIntValue(CODE)) {
+        if (null == response) {
+            return null;
+        }
+        if (0 == response.getIntValue(CODE)) {
             return response.getString("registration_link");
         }
         throw new PayErrorException(new PayException("fail", "Payoneer获取授权页面失败,原因:" + response.getString("hint"), response.toJSONString()));
@@ -266,7 +269,7 @@ public Map<String, Object> microPay(PayOrder order) {
         if (response != null) {
             return response;
         }
-        throw new PayErrorException(new PayException("fail", "Payoneer申请收款失败,原因:" + response.getString("description"), response.toJSONString()));
+        throw new PayErrorException(new PayException("fail", "Payoneer申请收款失败,原因:未有返回值" ));
     }
 
     /**
@@ -296,6 +299,18 @@ public Map<String, Object> close(String tradeNo, String outTradeNo) {
         return secondaryInterface(tradeNo, outTradeNo, PayoneerTransactionType.CHARGE_CANCEL);
     }
 
+    /**
+     * 交易交易撤销
+     *
+     * @param tradeNo    支付平台订单号
+     * @param outTradeNo 商户单号
+     * @return 返回支付方交易撤销后的结果
+     */
+    @Override
+    public Map<String, Object> cancel(String tradeNo, String outTradeNo) {
+        return secondaryInterface(tradeNo, outTradeNo, PayoneerTransactionType.CHARGE_CANCEL);
+    }
+
     /**
      * 申请退款接口
      * 废弃
diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.11.3</version>
+        <version>2.12.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.11.3</version>
+        <version>2.12.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-wx-youdian</artifactId>
diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java
@@ -12,8 +12,6 @@
 import com.egzosn.pay.common.util.str.StringUtils;
 import com.egzosn.pay.wx.youdian.bean.YdPayError;
 import com.egzosn.pay.wx.youdian.bean.YoudianTransactionType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -28,7 +26,6 @@
  * date 2017/01/12 22:58
  */
 public class WxYouDianPayService extends BasePayService<WxYouDianPayConfigStorage> {
-    protected static final Log LOG = LogFactory.getLog(WxYouDianPayService.class);
 
     private final static String URL = "http://life.51youdian.com/Api/CheckoutCounter/";
 
