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

1. 增加退款查询 退款单号，订单有效时间

Browse Source
This commit is contained in:
egan
2018-08-04 18:04:06 +08:00
parent 01b9938f91
commit 81b44146ff
12 changed files with 215 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
View File

@@ -200,7 +200,8 @@ public class AliPayService extends BasePayService {
bizContent.put("product_code", "QUICK_MSECURITY_PAY");
}
}
//TODO 过期时间
// bizContent.put("timeout_express", )
orderInfo.put("biz_content", JSON.toJSONString(bizContent));
return orderInfo;
}
@@ -382,6 +383,31 @@ public class AliPayService extends BasePayService {
return secondaryInterface(tradeNo, outTradeNo, AliTransactionType.REFUNDQUERY);
}
/**
* 查询退款
*
* @param refundOrder 退款订单单号信息
* @return 返回支付方查询退款后的结果
*/
@Override
public Map<String, Object> refundquery(RefundOrder refundOrder){
//获取公共参数
Map<String, Object> parameters = getPublicParameters(AliTransactionType.REFUNDQUERY);
Map<String, Object> bizContent = getBizContent(refundOrder.getTradeNo(), refundOrder.getOutTradeNo(), null);
if (!StringUtils.isEmpty(refundOrder.getRefundNo())){
bizContent.put("out_request_no", refundOrder.getRefundNo());
}
//设置请求参数的集合
parameters.put("biz_content", JSON.toJSONString(bizContent));
//设置签名
setSign(parameters);
return requestTemplate.getForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(parameters), JSONObject.class);
}
/**
* 目前只支持日账单
* @param billDate 账单类型，商户通过接口或商户经开放平台授权后其所属服务商通过接口可以获取以下账单类型：trade、signcustomer；trade指商户基于支付宝交易收单的业务账单；signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单；
@@ -507,10 +533,10 @@ public class AliPayService extends BasePayService {
if (null == bizContent){
bizContent = new TreeMap<>();
}
if (null != outTradeNo){
if (!StringUtils.isEmpty(outTradeNo)){
bizContent.put("out_trade_no", outTradeNo);
}
if (null != tradeNo){
if (!StringUtils.isEmpty(tradeNo)){
bizContent.put("trade_no", tradeNo);
}
return bizContent;

24
pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java
View File

@@ -16,7 +16,6 @@ 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.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
@@ -389,7 +388,30 @@ public class AliPayService extends BasePayService {
public Map<String, Object> refundquery(String tradeNo, String outTradeNo) {
return secondaryInterface(tradeNo, outTradeNo, AliTransactionType.REFUNDQUERY);
}
/**
* 查询退款
*
* @param refundOrder 退款订单单号信息
* @return 返回支付方查询退款后的结果
*/
@Override
public Map<String, Object> refundquery(RefundOrder refundOrder){
//获取公共参数
Map<String, Object> parameters = getPublicParameters(AliTransactionType.REFUNDQUERY);
Map<String, Object> bizContent = getBizContent(refundOrder.getTradeNo(), refundOrder.getOutTradeNo(), null);
if (!StringUtils.isEmpty(refundOrder.getRefundNo())){
bizContent.put("out_request_no", refundOrder.getRefundNo());
}
//设置请求参数的集合
parameters.put("biz_content", JSON.toJSONString(bizContent));
//设置签名
setSign(parameters);
return requestTemplate.getForObject(QUERY_REQ_URL + "?" + UriVariables.getMapToParameters(parameters), JSONObject.class);
}
/**