lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-09-03 05:24:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

转账订单查询新接口实现

Browse Source
This commit is contained in:
egan
2023-10-09 21:59:30 +08:00
parent 8cdef6f818
commit e7892bc27f
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,10 +15,10 @@ import org.apache.http.message.BasicHeader;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.egzosn.pay.common.api.BasePayService;
import com.egzosn.pay.common.api.TransferService;
import com.egzosn.pay.common.bean.AssistOrder;
import com.egzosn.pay.common.bean.BaseRefundResult;
import com.egzosn.pay.common.bean.BillType;
import com.egzosn.pay.common.bean.CurType;
import com.egzosn.pay.common.bean.DefaultCurType;
import com.egzosn.pay.common.bean.MethodType;
@@ -52,7 +52,7 @@ import com.egzosn.pay.payoneer.bean.PayoneerTransactionType;
* create 2018-01-19
* </pre>
*/
public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> implements AdvancedPayService {
public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> implements AdvancedPayService, TransferService {
/**
* 测试地址
*/
@@ -150,6 +150,7 @@ public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> im
return verify(new NoticeParams(params));
}
/**
* 回调校验
*
@@ -318,16 +319,18 @@ public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> im
public Map<String, Object> close(String tradeNo, String outTradeNo) {
return secondaryInterface(tradeNo, outTradeNo, PayoneerTransactionType.CHARGE_CANCEL);
}
/**
* 交易关闭接口
*
* @param assistOrder 关闭订单
* @param assistOrder 关闭订单
* @return 返回支付方交易关闭后的结果
*/
@Override
public Map<String, Object> close(AssistOrder assistOrder){
public Map<String, Object> close(AssistOrder assistOrder) {
return secondaryInterface(assistOrder.getTradeNo(), assistOrder.getOutTradeNo(), PayoneerTransactionType.CHARGE_CANCEL);
}
/**
* 交易交易撤销
*
@@ -465,6 +468,17 @@ public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> im
return response;
}
/**
* 转账查询
*
* @param assistOrder 辅助交易订单
* @return 对应的转账订单
*/
@Override
public Map<String, Object> transferQuery(AssistOrder assistOrder) {
return secondaryInterface(assistOrder.getTradeNo(), assistOrder.getOutTradeNo(), PayoneerTransactionType.PAYOUT_STATUS);
}
/**
* 转账
*
@@ -482,6 +496,7 @@ public class PayoneerPayService extends BasePayService<PayoneerConfigStorage> im
*
* @return 请求地址
*/
@Override
public String getReqUrl(TransactionType type) {
return (payConfigStorage.isTest() ? SANDBOX_DOMAIN : RELEASE_DOMAIN) + payConfigStorage.getPid() + "/" + type.getMethod();
}

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

@@ -40,6 +40,7 @@ import static com.egzosn.pay.wx.bean.WxTransferType.TRANSFERS;
import com.alibaba.fastjson.JSONObject;
import com.egzosn.pay.common.api.BasePayService;
import com.egzosn.pay.common.api.TransferService;
import com.egzosn.pay.common.bean.AssistOrder;
import com.egzosn.pay.common.bean.BillType;
import com.egzosn.pay.common.bean.MethodType;
@@ -86,7 +87,7 @@ import com.egzosn.pay.wx.bean.WxTransferType;
* date 2016-5-18 14:09:01
* </pre>
*/
public class WxPayService extends BasePayService<WxPayConfigStorage> implements WxRedPackService, WxBillService {
public class WxPayService extends BasePayService<WxPayConfigStorage> implements WxRedPackService, WxBillService, TransferService {
/**
@@ -862,6 +863,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> implements
return getHttpRequestTemplate().postForObject(getReqUrl(order.getTransferType()), XML.getMap2Xml(parameters), JSONObject.class);
}
/**
* 转账到余额所需要参数
*
@@ -914,18 +916,37 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> implements
* <a href="https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=24_3">商户企业付款到银行卡</a>
* </p>
* @return 对应的转账订单
* @deprecated {@link #transferQuery(AssistOrder)}
*/
@Deprecated
@Override
public Map<String, Object> transferQuery(String outNo, String wxTransferType) {
if (StringUtils.isEmpty(wxTransferType)) {
throw new PayErrorException(new WxPayError(FAILURE, "微信转账类型必填，详情com.egzosn.pay.wx.bean.WxTransferType"));
}
AssistOrder assistOrder = new AssistOrder(outNo);
assistOrder.setTransactionType(WxTransferType.valueOf(wxTransferType));
return transferQuery(assistOrder);
}
/**
* 转账查询
*
* @param assistOrder 辅助交易订单
* @return 对应的转账订单
*/
@Override
public Map<String, Object> transferQuery(AssistOrder assistOrder) {
Map<String, Object> parameters = new TreeMap<String, Object>();
parameters.put(MCH_ID, payConfigStorage.getPid());
parameters.put("partner_trade_no", outNo);
parameters.put("partner_trade_no", assistOrder.getOutTradeNo());
parameters.put(NONCE_STR, SignTextUtils.randomStr());
if (StringUtils.isEmpty(wxTransferType)) {
throw new PayErrorException(new WxPayError(FAILURE, "微信转账类型 #transferQuery(String outNo, String wxTransferType) 必填，详情com.egzosn.pay.wx.bean.WxTransferType"));
if (null == assistOrder.getTransactionType()) {
throw new PayErrorException(new WxPayError(FAILURE, "微信转账类型必填，详情com.egzosn.pay.wx.bean.WxTransferType"));
}
//如果类型为余额方式
if (TRANSFERS.getType().equals(wxTransferType) || GETTRANSFERINFO.getType().equals(wxTransferType)) {
if (TRANSFERS == assistOrder.getTransactionType() || GETTRANSFERINFO == assistOrder.getTransactionType()) {
parameters.put(APPID, payConfigStorage.getAppId());
parameters.put(SIGN, createSign(SignTextUtils.parameterText(parameters, "&", SIGN), payConfigStorage.getInputCharset()));
return getHttpRequestTemplate().postForObject(getReqUrl(GETTRANSFERINFO), XML.getMap2Xml(parameters), JSONObject.class);
@@ -935,7 +956,6 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> implements
return getHttpRequestTemplate().postForObject(getReqUrl(QUERY_BANK), XML.getMap2Xml(parameters), JSONObject.class);
}
private String keyPublic(String content) {
try {
return RSA2.encrypt(content, payConfigStorage.getKeyPublic(), CIPHER_ALGORITHM, payConfigStorage.getInputCharset());