lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-06-04 15:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码回滚

Browse Source
This commit is contained in:
egzosn
2020-03-10 22:08:15 +08:00
parent 1b9ddab562
commit 45f6942a0c
8 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,20 +467,4 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
return orderInfo;
}
protected Map<String, Object> setParameters(Map<String, Object> parameters, String key, String value) {
if (StringUtils.isNotEmpty(value)) {
parameters.put(key, value);
}
return parameters;
}
protected Map<String, Object> setParameters(Map<String, Object> parameters, String key, Order order) {
Object attr = order.getAttr(key);
if (null != attr && !"".equals(attr)) {
parameters.put(key, attr);
}
return parameters;
}
}

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

@@ -17,12 +17,6 @@ public interface Order {
* 获取订单属性 这里可用做覆盖已设置的订单信息属性，订单信息在签名前进行覆盖。
* @return 属性
*/
Map<String, Object> getAttrs();
/**
* 获取订单属性 这里可用做覆盖已设置的订单信息属性，订单信息在签名前进行覆盖。
* @param key 属性名
* @return 属性
*/
Object getAttr(String key);
Map<String, Object> getAttr();
}

2
pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java
View File

@@ -203,7 +203,7 @@ public class FuiouPayService extends BasePayService<FuiouPayConfigStorage> {
parameters.put("rem", "");
//版本号
parameters.put("ver", "1.0.1");
parameters.putAll(order.getAttrs());
parameters.putAll(order.getAttr());
return preOrderHandler(parameters, order);
}

2
pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java
View File

@@ -184,7 +184,7 @@ public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> im
}
params.put("currency", order.getCurType());
params.put("description", order.getSubject());
params.putAll(order.getAttrs());
params.putAll(order.getAttr());
return preOrderHandler(params, order);
}

2
pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java
View File

@@ -284,7 +284,7 @@ public class UnionPayService extends BasePayService<UnionPayConfigStorage> {
params.put(SDKConstants.param_payTimeout, getPayTimeout(order.getExpirationTime()));
params.put("orderDesc", order.getSubject());
}
params.putAll(order.getAttrs());
params.putAll(order.getAttr());
params = preOrderHandler(params, order);
return setSign(params);
}

2
pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java
View File

@@ -227,7 +227,7 @@ public class WxYouDianPayService extends BasePayService<WxYouDianPayConfigStorag
Map<String, Object> data = new TreeMap<>();
data.put("access_token", getAccessToken());
data.put("paymoney", Util.conversionAmount(order.getPrice()).toString());
data.putAll(order.getAttrs());
data.putAll(order.getAttr());
data = preOrderHandler(data, order);
String apbNonce = SignUtils.randomStr();
String sign = createSign(SignUtils.parameterText(data, "") + apbNonce, payConfigStorage.getInputCharset());

59
pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
View File

@@ -8,6 +8,7 @@ import com.egzosn.pay.common.bean.result.PayException;
import com.egzosn.pay.common.exception.PayErrorException;
import com.egzosn.pay.common.http.HttpConfigStorage;
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.sign.encrypt.RSA2;
@@ -17,13 +18,13 @@ import com.egzosn.pay.wx.bean.WxPayMessage;
import com.egzosn.pay.wx.bean.WxTransactionType;
import com.egzosn.pay.common.util.XML;
import com.egzosn.pay.wx.bean.WxTransferType;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
import static com.egzosn.pay.wx.api.WxConst.*;
import static com.egzosn.pay.wx.bean.WxTransferType.*;
/**
@@ -38,6 +39,27 @@ import static com.egzosn.pay.wx.bean.WxTransferType.*;
public class WxPayService extends BasePayService<WxPayConfigStorage> {
/**
* 微信请求地址
*/
public static final String URI = "https://api.mch.weixin.qq.com/";
/**
* 沙箱
*/
public static final String SANDBOXNEW = "sandboxnew/";
public static final String SUCCESS = "SUCCESS";
public static final String RETURN_CODE = "return_code";
public static final String SIGN = "sign";
public static final String CIPHER_ALGORITHM = "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING";
public static final String FAILURE = "failure";
public static final String APPID = "appid";
private static final String HMAC_SHA256 = "HMAC-SHA256";
private static final String HMACSHA256 = "HMACSHA256";
private static final String RETURN_MSG_CODE = "return_msg";
private static final String RESULT_CODE = "result_code";
private static final String MCH_ID = "mch_id";
private static final String NONCE_STR = "nonce_str";
/**
@@ -96,21 +118,17 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
public boolean verify(Map<String, Object> params) {
if (!(SUCCESS.equals(params.get(RETURN_CODE)) && SUCCESS.equals(params.get(RESULT_CODE)))) {
if (LOG.isErrorEnabled()){
LOG.error(String.format("微信支付异常：return_code=%s,参数集=%s", params.get(RETURN_CODE), params));
}
LOG.debug(String.format("微信支付异常：return_code=%s,参数集=%s", params.get(RETURN_CODE), params));
return false;
}
if (null == params.get(SIGN)) {
if (LOG.isDebugEnabled()){
LOG.debug(String.format("微信支付异常：签名为空！%s=%s", OUT_TRADE_NO, params.get(OUT_TRADE_NO)));
}
LOG.debug("微信支付异常：签名为空！out_trade_no=" + params.get("out_trade_no"));
return false;
}
try {
return signVerify(params, (String) params.get(SIGN)) && verifySource((String) params.get(OUT_TRADE_NO));
return signVerify(params, (String) params.get(SIGN)) && verifySource((String) params.get("out_trade_no"));
} catch (PayErrorException e) {
LOG.error(e);
}
@@ -185,9 +203,9 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
// 购买支付信息
parameters.put("body", order.getSubject());
// 购买支付信息
setParameters(parameters, "detail", order);
// parameters.put("detail", order.getBody());
// 订单号
parameters.put(OUT_TRADE_NO, order.getOutTradeNo());
parameters.put("out_trade_no", order.getOutTradeNo());
parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getSpbillCreateIp()) ? "192.168.1.150" : order.getSpbillCreateIp());
// 总金额单位为分
parameters.put("total_fee", Util.conversionCentAmount(order.getPrice()));
@@ -204,12 +222,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
}
((WxTransactionType) order.getTransactionType()).setAttribute(parameters, order);
//可覆盖参数
setParameters(parameters, "notify_url", order);
setParameters(parameters, "goods_tag", order);
setParameters(parameters, "limit_pay", order);
setParameters(parameters, "receipt", order);
setParameters(parameters, "product_id", order);
parameters.putAll(order.getAttr());
parameters = preOrderHandler(parameters, order);
setSign(parameters);
@@ -263,6 +276,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
params.put("noncestr", result.get(NONCE_STR));
params.put("package", "Sign=WXPay");
}
params = preOrderHandler(params, order);
String paySign = createSign(SignUtils.parameterText(params), payConfigStorage.getInputCharset());
params.put(SIGN, paySign);
return params;
@@ -499,7 +513,12 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
}
private Map<String, Object> setParameters(Map<String, Object> parameters, String key, String value) {
if (StringUtils.isNotEmpty(value)) {
parameters.put(key, value);
}
return parameters;
}
/**
* 申请退款接口
@@ -513,7 +532,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
Map<String, Object> parameters = getPublicParameters();
setParameters(parameters, "transaction_id", refundOrder.getTradeNo());
setParameters(parameters, OUT_TRADE_NO, refundOrder.getOutTradeNo());
setParameters(parameters, "out_trade_no", refundOrder.getOutTradeNo());
setParameters(parameters, "out_refund_no", refundOrder.getRefundNo());
parameters.put("total_fee", Util.conversionCentAmount(refundOrder.getTotalAmount()));
parameters.put("refund_fee", Util.conversionCentAmount(refundOrder.getRefundAmount()));
@@ -552,7 +571,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
//获取公共参数
Map<String, Object> parameters = getPublicParameters();
setParameters(parameters, "transaction_id", refundOrder.getTradeNo());
setParameters(parameters, OUT_TRADE_NO, refundOrder.getOutTradeNo());
setParameters(parameters, "out_trade_no", refundOrder.getOutTradeNo());
setParameters(parameters, "out_refund_no", refundOrder.getRefundNo());
//设置签名
setSign(parameters);
@@ -619,7 +638,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
//获取公共参数
Map<String, Object> parameters = getPublicParameters();
setParameters(parameters, OUT_TRADE_NO, outTradeNoBillType);
setParameters(parameters, "out_trade_no", outTradeNoBillType);
setParameters(parameters, "transaction_id", (String) transactionIdOrBillDate);
//设置签名
setSign(parameters);

2
pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java
View File

@@ -175,7 +175,7 @@ public class YiJiPayService extends BasePayService<YiJiPayConfigStorage> {
if (null != order.getCurType()){
orderInfo.put("currency", order.getCurType());
}
orderInfo.putAll(order.getAttrs());
orderInfo.putAll(order.getAttr());
return preOrderHandler(orderInfo, order);
}