diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 9af574d..a0e76c4 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -12,11 +12,9 @@ import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.DateUtils; -import com.egzosn.pay.common.util.MatrixToImageWriter; import com.egzosn.pay.common.util.Util; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; -import java.awt.image.BufferedImage; import java.math.BigDecimal; import java.util.*; @@ -28,7 +26,7 @@ import java.util.*; * email egzosn@gmail.com * date 2017-2-22 20:09 */ -public class AliPayService extends BasePayService { +public class AliPayService extends BasePayService { /** * 正式测试环境 diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/OrderSettle.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/OrderSettle.java index 0f52df3..f4227b9 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/OrderSettle.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/OrderSettle.java @@ -4,11 +4,11 @@ import com.egzosn.pay.common.util.Util; import com.egzosn.pay.common.util.str.StringUtils; import java.math.BigDecimal; -import java.util.HashMap; import java.util.Map; import java.util.TreeMap; /** + * 交易结算信息 * @author egan * email egzosn@gmail.com * date 2019/4/28.20:29 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 ae9c93b..5ad9318 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 @@ -35,7 +35,7 @@ import static com.egzosn.pay.ali.api.AliPayService.SIGN; * @see com.egzosn.pay.ali.api.AliPayService */ @Deprecated -public class AliPayService extends BasePayService { +public class AliPayService extends BasePayService { 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 53d5c90..ef39af7 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 @@ -26,7 +26,7 @@ import java.util.*; * date 2017/3/5 20:36 * */ -public abstract class BasePayService implements PayService { +public abstract class BasePayService implements PayService { protected final Log LOG = LogFactory.getLog(getClass()); protected PC payConfigStorage; @@ -138,7 +138,7 @@ public abstract class BasePayService implements Pay * @return 对应页面重定向信息 */ @Override - public String toPay(PayOrder order) { + public String toPay(O order) { Map orderInfo = orderInfo(order); return buildRequest(orderInfo, MethodType.POST); } @@ -150,7 +150,7 @@ public abstract class BasePayService implements Pay * @return 返回图片信息,支付时需要的 */ @Override - public BufferedImage genQrPay(PayOrder order) { + public BufferedImage genQrPay(O order) { return MatrixToImageWriter.writeInfoToJpgBuff(getQrPay(order)); } @@ -463,7 +463,7 @@ public abstract class BasePayService implements Pay * @param orderInfo 订单信息 * @return 处理后订单信息 */ - public Map preOrderHandler(Map orderInfo, PayOrder payOrder){ + public Map preOrderHandler(Map orderInfo, O payOrder){ return orderInfo; } diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java index eececb9..7066266 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java @@ -20,7 +20,7 @@ import java.util.Map; * date 2016-5-18 14:09:01 * */ -public interface PayService { +public interface PayService { /** @@ -88,7 +88,7 @@ public interface PayService { * @return 订单信息 * @see PayOrder 支付订单信息 */ - Map orderInfo(PayOrder order); + Map orderInfo(O order); /** * 页面转跳支付, 返回对应页面重定向信息 @@ -96,7 +96,7 @@ public interface PayService { * @param order 订单信息 * @return 对应页面重定向信息 */ - String toPay(PayOrder order); + String toPay(O order); /** * 创建签名 @@ -160,14 +160,14 @@ public interface PayService { * @param order 发起支付的订单信息 * @return 返回图片信息,支付时需要的 */ - BufferedImage genQrPay(PayOrder order); + BufferedImage genQrPay(O order); /** * 获取输出二维码信息, * * @param order 发起支付的订单信息 * @return 返回二维码信息,,支付时需要的 */ - String getQrPay(PayOrder order); + String getQrPay(O order); /** * 刷卡付,pos主动扫码付款(条码付) @@ -175,7 +175,7 @@ public interface PayService { * @param order 发起支付的订单信息 * @return 返回支付结果 */ - Map microPay(PayOrder order); + Map microPay(O order); /** * 交易查询接口 @@ -453,4 +453,15 @@ public interface PayService { * @return 支付消息对象 */ PayMessage createMessage(Map message); + + /** + * 预订单回调处理器,用于订单信息的扩展 + * 签名之前使用 + * 如果需要进行扩展请重写该方法即可 + * @param orderInfo 商户平台预订单信息 + * @param payOrder 订单信息 + * @return 处理后订单信息 + */ + Map preOrderHandler(Map orderInfo, O payOrder); + } 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 index d297c9d..2c67b2c 100644 --- 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 @@ -21,7 +21,7 @@ import java.util.*; * create 2017 2017/1/16 0016 * */ -public class FuiouPayService extends BasePayService { +public class FuiouPayService extends BasePayService { /** * 正式域名 @@ -129,14 +129,14 @@ public class FuiouPayService extends BasePayService { /** * 校验回调数据来源是否合法 * - * @param order_id 业务id, 数据的真实性. + * @param orderId 业务id, 数据的真实性. * @return 返回校验结果 */ @Override - public boolean verifySource(String order_id) { + public boolean verifySource(String orderId) { LinkedHashMap params = new LinkedHashMap<>(); params.put("mchnt_cd", payConfigStorage.getPid()); - params.put("order_id", order_id); + params.put("order_id", orderId); params.put("md5", createSign(SignUtils.parameters2MD5Str(params, "|"), payConfigStorage.getInputCharset())); JSONObject resultJson = getHttpRequestTemplate().postForObject(getReqUrl() + URL_FuiouSmpAQueryGate + "?" + UriVariables.getMapToParameters(params), null, JSONObject.class); if (null == resultJson){ diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java index 9ef4017..76c3a0e 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java @@ -1,6 +1,7 @@ package com.egzosn.pay.payoneer.api; import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.PayOrder; import java.util.Map; @@ -15,7 +16,7 @@ import java.util.Map; * */ -public interface AdvancedPayService extends PayService { +public interface AdvancedPayService extends PayService { /** * 获取授权页面 * @param payeeId 用户id 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 index 4d61b73..f0f2de8 100644 --- 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 @@ -33,7 +33,7 @@ import java.util.*; * create 2018-01-19 * */ -public class PayoneerPayService extends BasePayService implements AdvancedPayService { +public class PayoneerPayService extends BasePayService implements AdvancedPayService { /** * 测试地址 */ diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java index b94f887..6519c9d 100644 --- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java +++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java @@ -29,7 +29,7 @@ import java.util.concurrent.locks.Lock; * email egzosn@gmail.com * date 2018-4-8 ‏‎22:15:09 */ -public class PayPalPayService extends BasePayService{ +public class PayPalPayService extends BasePayService{ /** * 沙箱环境 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 90aaad6..0637aa1 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 @@ -38,7 +38,7 @@ import java.util.*; * create 2017 2017/11/5 * */ -public class UnionPayService extends BasePayService { +public class UnionPayService extends BasePayService { /** * 测试域名 */ 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 index 2d7775f..7134cfb 100644 --- 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 @@ -27,7 +27,7 @@ import java.util.concurrent.locks.Lock; * email egzosn@gmail.com * date 2017/01/12 22:58 */ -public class WxYouDianPayService extends BasePayService { +public class WxYouDianPayService extends BasePayService { private final static String URL = "http://life.51youdian.com/Api/CheckoutCounter/"; diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 5027d82..9368a2f 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -36,7 +36,7 @@ import static com.egzosn.pay.wx.bean.WxTransferType.*; * date 2016-5-18 14:09:01 * */ -public class WxPayService extends BasePayService { +public class WxPayService extends BasePayService { /** diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java index cece47f..911c9a2 100644 --- a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java @@ -27,7 +27,7 @@ import java.util.TreeMap; * email egzosn@gmail.com * * date 2019/04/15 22:51 */ -public class YiJiPayService extends BasePayService { +public class YiJiPayService extends BasePayService { /** * 正式测试环境 diff --git a/wx.jpg b/wx.jpg deleted file mode 100644 index 4332207..0000000 Binary files a/wx.jpg and /dev/null differ