刷卡付,条码付实现

为兼容刷卡付等支付结果校验,修改校验接口入参
This commit is contained in:
cnzzs
2017-05-10 23:26:46 +08:00
parent 16c7880e3e
commit 904d7a6070
16 changed files with 196 additions and 80 deletions

View File

@@ -214,13 +214,13 @@ public class AliPayService extends BasePayService {
private Map<String, Object> getOrderBefore(PayOrder order) {
Map<String, Object> orderInfo = new TreeMap<>();
// 签约合作者身份ID
orderInfo.put("partner", payConfigStorage.getPartner());
orderInfo.put("partner", payConfigStorage.getPid());
// 签约卖家支付宝账号
orderInfo.put("seller_id", payConfigStorage.getSeller());
// 商户网站唯一订单号
orderInfo.put("out_trade_no", order.getTradeNo());
orderInfo.put("out_trade_no", order.getOutTradeNo());
// 商品名称
orderInfo.put("subject", order.getSubject());
@@ -270,9 +270,9 @@ public class AliPayService extends BasePayService {
* @return 获得回调的请求参数
*/
@Override
public Map<String, String> getParameter2Map(Map<String, String[]> parameterMap, InputStream is) {
public Map<String, Object> getParameter2Map(Map<String, String[]> parameterMap, InputStream is) {
Map<String,String> params = new TreeMap<String,String>();
Map<String, Object> params = new TreeMap<String, Object>();
for (Iterator iter = parameterMap.keySet().iterator(); iter.hasNext();) {
String name = (String) iter.next();
String[] values = parameterMap.get(name);
@@ -365,6 +365,27 @@ public class AliPayService extends BasePayService {
throw new PayErrorException(new PayException(response.getString("code"), response.getString("msg"), result.toJSONString()));
}
/**
* pos主动扫码付款(条码付)
* @param order 发起支付的订单信息
* @return 支付结果
*/
@Override
public Map<String, Object> microPay(PayOrder order) {
Map<String, Object> orderInfo = orderInfo(order);
// Map<String, Object> content = new HashMap<>(1);
// content.put("biz_content", orderInfo.remove("biz_content"));
//预订单
JSONObject result = getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(orderInfo), null, JSONObject.class);
JSONObject response = result.getJSONObject("alipay_trade_precreate_response");
if ("10000".equals(response.getString("code"))){
return response;
}
throw new PayErrorException(new PayException(response.getString("code"), response.getString("msg"), result.toJSONString()));
}
/**
* 交易查询接口
* @param tradeNo 支付平台订单号

View File

@@ -62,7 +62,7 @@ public class AliPayService extends BasePayService {
* @return 签名校验 true通过
*/
@Override
public boolean verify(Map<String, String> params) {
public boolean verify(Map<String, Object> params) {
if (params.get("sign") == null || params.get("notify_id") == null) {
log.debug("支付宝支付异常params" + params);
@@ -70,7 +70,7 @@ public class AliPayService extends BasePayService {
}
try {
return signVerify(params, params.get("sign")) && verifySource(params.get("notify_id"));
return signVerify(params, (String) params.get("sign")) && verifySource((String) params.get("notify_id"));
} catch (PayErrorException e) {
e.printStackTrace();
}
@@ -95,7 +95,7 @@ public class AliPayService extends BasePayService {
* @return 生成的签名结果
*/
@Override
public boolean signVerify(Map<String, String> params, String sign) {
public boolean signVerify(Map<String, Object> params, String sign) {
return SignUtils.valueOf(payConfigStorage.getSignType()).verify(params, sign, payConfigStorage.getKeyPublic(), payConfigStorage.getInputCharset());
}
@@ -215,9 +215,9 @@ public class AliPayService extends BasePayService {
* @return 获得回调的请求参数
*/
@Override
public Map<String, String> getParameter2Map(Map<String, String[]> parameterMap, InputStream is) {
public Map<String, Object> getParameter2Map(Map<String, String[]> parameterMap, InputStream is) {
Map<String,String> params = new TreeMap<String,String>();
Map<String, Object> params = new TreeMap<String,Object>();
for (Iterator iter = parameterMap.keySet().iterator(); iter.hasNext();) {
String name = (String) iter.next();
String[] values = parameterMap.get(name);
@@ -293,6 +293,16 @@ public class AliPayService extends BasePayService {
throw new UnsupportedOperationException();
}
/**
* 刷卡付,pos主动扫码付款(条码付)
* @param order 发起支付的订单信息
* @return 支付结果
*/
@Override
public Map<String, Object> microPay(PayOrder order) {
throw new UnsupportedOperationException();
}
/**
* 交易查询接口