Skip to content

ldy / payment

Go to a project
Commit b5654469 by 郑建康（PHP）
Options

修复慧收钱支付、退款模块细节问题

1 parent dbb48a91
Inline Side-by-side
Showing with 76 additions and 67 deletions
examples/hsq/config.php
......@@ -29,7 +29,7 @@ return [
/* 猎维(智能充) begin */
'key'=> '6a84817f0214990c0e52871aa33ca777', //商户key
'merchantNo' => '861002923881', //商户号
'appid' => 'wx7d8e1164d40f77be', //微信公众号APPID
'appid' => 'wxfbe753bb28212636', //微信公众号APPID
// 'private_key' => dirname(__FILE__) .'/certFile/hsq/liewei_pri.pfx', //私钥
'private_key' => '-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDXwmROITU7SwEN
......
examples/hsq/liteCharge.php
......@@ -12,9 +12,9 @@ $config = require_once __DIR__ . '/config.php';
$payData = [
'transNo' => "WechatPay".date("YmdHis"), //商户订单号
'orderAmt' => 1,//交易金额(单位分)
'orderAmt' => 100,//交易金额(单位分)
'goodsInfo' => '支付测试', //商品说明
'openid' => 'oAFzv5UAHlFeaiQjIXPGMrZWdPaA',
'openid' => 'oAFzv5a67bJ0aGk7cB-RfK0Yap8s',
'longitude' => '171.21', //经度
'latitude' => '22.33', //纬度
];
......
examples/hsq/notify.php
......@@ -10,16 +10,7 @@ date_default_timezone_set('Asia/Shanghai');
$config = require_once __DIR__ . '/config.php';
$_POST['req'] = [
'method' => 'CALLBACK',
'format' => 'json',
'signType' => 'RSA2',
'signContent' => '{"transNo":"WechatPay20230505172514","payType":"WECHAT_APPLET","orderAmt":1,"goodsInfo":"支付测试","returnUrl":null,"requestDate":"20230505172514","memo":"{\"openid\":\"oUpF8uMuAJO_M2pxb1Q9zNjWeS6o\",\"appid\":\"wxb63c89abb9243ad0\",\"spbillCreateIp\":\"127.0.0.1\",\"longitude\":null,\"latitude\":null}"}',
'version' => '1.0',
'merchantNo' => '814000473149',
// 'sign' => '219518285f7faea08921f367ec05958f629ef61d0216bf826599cf51d7541feeb08fb2e07f88b83f33f4db8443d81a2beafd0b1affbd8a2d529d8a6d7b6bc3445700edc448d666ac139acd7115dc61d6e7691527e7b05a1143006eef4ef7d67114359e833dc73a1f01a6cf3711e1955e268f2f47978d683fed54127d23a40f72',
'sign' => '68d9975afec900871fc36212c2ccedac08ffea2b3f212f5d5d37ff8af78bd77f12dfa77cdfd291a2bcda61d462b9ef11c3479707f35300b76c361b4a87f6dcb856a5e1e56c2cdc6e894ce69ffee6fe2c5709dd4756779ac389a717d35cb203406135bc77a403735cd5da630f28f5cdd22259d32d2a07e4a5febb15f894940f9e',
];
$_POST['req'] = 'method=CALLBACK&format=json&sign=115a949ed99f50978e0f301ee49b288cb83ff3cc0fe25ae8a6e9397524f34417ad32887fde2f3c20879879a5cb77f77c80161a7e868cf6d4b73879ec859f95d3a4531216f551abb8da050921a3a0db49362a7410c9ed8c71ea789ea56e49f4c9a7d82e437dcd41e1e58734720f0bba1c450f380948241c3444ada85700a6d856e0f2a8a01ff085a23092e0cad006d8a142e76af4907e4c17b2db47f2b512acb839e4b40a896bb8f98b594677590d39ee3af92cd324dddc6d4ce01cb19bbc4020b205415cd8d5b5b0ab6c0fbc7968ecb00571c43dd7f4a20cf8e9dc74209b17b7f4c75a4f4cae71fae16cac6ba2578f826d5ff9cf1dde2bed9ed8f6430909cac3&signType=RSA2&signContent=%7B%22buyerName%22%3A%22oAFzv5a67bJ0aGk7cB-RfK0Yap8s%22%2C%22channelOrderNo%22%3A%2223050815371110591231100592117922%22%2C%22finishedDate%22%3A%2220230508153801%22%2C%22fundBankCode%22%3A%22OTHERS%22%2C%22fundChannel%22%3A%22OTHERS%22%2C%22goodsInfo%22%3A%22%E6%94%AF%E4%BB%98%E6%B5%8B%E8%AF%95%22%2C%22memo%22%3A%22%7B%5C%22openid%5C%22%3A%5C%22oAFzv5a67bJ0aGk7cB-RfK0Yap8s%5C%22%2C%5C%22appid%5C%22%3A%5C%22wxfbe753bb28212636%5C%22%2C%5C%22latitude%5C%22%3A%5C%2222.33%5C%22%2C%5C%22spbillCreateIp%5C%22%3A%5C%22150.158.53.11%5C%22%2C%5C%22paylimit%5C%22%3A%5C%22no_credit%5C%22%2C%5C%22longitude%5C%22%3A%5C%22171.21%5C%22%7D%22%2C%22orderAmt%22%3A%221%22%2C%22orderStatus%22%3A%22SUCCESS%22%2C%22payOrderNo%22%3A%224200001871202305087489820896%22%2C%22payType%22%3A%22WECHAT_APPLET%22%2C%22requestDate%22%3A%2220230508153751%22%2C%22respCode%22%3A%22000000%22%2C%22respMsg%22%3A%22%E4%BA%A4%E6%98%93%E6%88%90%E5%8A%9F%22%2C%22tradeNo%22%3A%2225000020230420101055003876003836%22%2C%22transNo%22%3A%22WechatPay20230508153751%22%7D&version=1.0.0&merchantNo=861002923881';
try {
$ret = Notify::run(Config::HSQ_CHARGE, $config, new TestNotify());
......
src/Common/Hsq/Data/Charge/PubChargeData.php
......@@ -70,7 +70,6 @@ class PubChargeData extends ChargeBaseData
'key' => $this->key,
/* 公共请求参数 end */
];
$this->retData = $signData;
}
......
src/Common/Hsq/Data/RefundData.php
......@@ -16,7 +16,7 @@ class RefundData extends HsqBaseData
protected function checkDataParam()
{
if (empty($this->transNo) || mb_strlen($this->transNo) > 30) throw new PayException('商户系统退款单号不能为空且长度不能超过30位');
if (empty($this->origTransNo) || mb_strlen($this->origTransNo) > 30) throw new PayException('原商户系统订单号不能为空且长度不能超过30位');
// if (empty($this->origTransNo) || mb_strlen($this->origTransNo) > 30) throw new PayException('原商户系统订单号不能为空且长度不能超过30位');
$totalFee = intval($this->origOrderAmt ?? 0); //订单总金额
$refundFee = intval($this->orderAmt ?? 0); //退款总金额
......@@ -26,23 +26,29 @@ class RefundData extends HsqBaseData
protected function buildData()
{
$signContent = [
/* 业务请求参数 begin */
'transNo' => $this->transNo, //商户订单号
'refundType' => $this->refundType, //退款类型
'origTransNo' => $this->origTransNo, //原商户订单号
'origOrderAmt' => $this->origOrderAmt,//原订单金额
'orderAmt' => intval($this->orderAmt), //退款金额,单位为：分
'requestDate' => $this->requestDate, //请求时间
'refundReason' => $this->refundReason, //退款原因
'returnUrl' => ($this->returnUrl ?: '') , //后端通知地址, 用户支付完成后，慧收钱服务器主动通知商户服务器里指定地址
/* 业务请求参数 end */
];
$signData = [
'version' => $this->version,
'ins_cd' => $this->institutionId, //机构号，接入机构在富友的唯一代码
'mchnt_cd' => $this->merchantId, //商户号, 富友分配给二级商户的商户号
'term_id' => $this->terminalId ?? '88888888', //终端号(没有真实终端号统一填88888888)
'random_str' => $this->randomStr, //随机字符串
'mchnt_order_no' => $this->order_no, //商户订单号, 商户系统内部的订单号（5到30个字符、只能包含字母数字，区分大小写)
'order_type' => $this->order_type, //订单类型：ALIPAY(统一下单、条码支付、服务窗支付)，WECHAT(统一下单、条码支付、公众号支付)，UNIONPAY，BESTPAY(翼支付)
'refund_order_no' => $this->refund_no, //商户撤销单号
'total_amt' => $this->total_fee, //订单总金额
'refund_amt' => $this->refund_fee, //退款总金额
'operator_id' => $this->operator_id ?? '', //操作员
/* 公共请求参数 begin */
'method' => $this->method,//方法名
'version' => $this->version, //版本
'format' => $this->format, //请求格式
'merchantNo' => $this->merchantNo, //商户号
'signType' => $this->signType, //加密类型
'signContent' => json_encode($signContent,JSON_UNESCAPED_UNICODE),
'key' => $this->key,
/* 公共请求参数 end */
];
if (!empty($this->reserved_fy_term_id)) $signData['reserved_fy_term_id'] = $this->reserved_fy_term_id; //富友终端号
if (!empty($this->reserved_origi_dt)) $signData['reserved_origi_dt'] = $this->trade_date; //原交易日期（ yyyyMMdd ）！该值必定等于reserved_fy_settle_dt(富友接收交易时间。理论和合作方下单时间一致。微量夸日交易会不一致)。不填该值支持30天内的交易进行退款。填写该值，支持90天
$this->retData = $signData;
}
}
\ No newline at end of file
src/Common/Hsq/HsqBaseStrategy.php
......@@ -101,13 +101,10 @@ abstract class HsqBaseStrategy implements BaseStrategy
public function handle(array $data)
{
$buildClass = $this->getBuildDataClass();
$this->reqData = new $buildClass($this->config, $data);
$this->reqData->setSign();
$body = $this->reqData->getData();
$ret = $this->sendReq($body);
$flag = $this->verifySign($ret);
if (!$flag) {
throw new PayException('返回数据被篡改。请检查网络是否安全！');
......
src/Notify/HsqNotify.php
......@@ -43,10 +43,17 @@ class HsqNotify extends NotifyStrategy
{
//支持直接读取input流
$data = $_POST['req'] ?? file_get_contents('php://input');
if(count($data)<1){//如果参数为空,则不进行处理
if(empty($data)){//如果参数为空,则不进行处理
return false;
}
return $data;
$tmp = explode("&",urldecode($data));
$new_data = array();
foreach($tmp as $val)
{
$tmp2 = explode("=",$val);
$new_data[$tmp2[0]] = $tmp2[1];
}
return $new_data;
}
/**
......@@ -87,28 +94,28 @@ class HsqNotify extends NotifyStrategy
if (empty($publicKey)) return false;
$sign = $retData['sign'];
//固定格式拼接后
$signArr = [
'method' => $retData['method'],
'version' => $retData['version'],
'format' => $retData['format'],
'merchantNo' => $retData['merchantNo'],
'signType' => $retData['signType'],
'signContent' => $retData['signContent'],
'key' => $key,
];
$signStr = http_build_query($signArr);
$signStr = ArrayUtil::createLinkstring($signArr);
//验签
$result = openssl_verify($signStr,hex2bin($sign), $publicKey, OPENSSL_ALGO_SHA256);
if($result)
{
//验签成功
return true;
return true; //验签成功
}
else{
else
{
return false;
}
}
/**
......@@ -120,29 +127,38 @@ class HsqNotify extends NotifyStrategy
* @return array
* @author yeran
*/
protected function getRetData(array $data)
protected function getRetData(array $params)
{
if ($this->config->returnRaw) {
$data['channel'] = Config::HSQ_CHARGE;
return $data;
}
return $data;
// $retData = [
// 'cash_fee' => $data['cash_fee'],
// 'fee_type' => $data['fee_type'],
// 'appid' => $data['sub_appid'],
// 'sub_merchant_id' => $data['sub_merchant_id'],
// 'buyer_id' => $data['sub_openid'],
// 'order_no' => $data['out_trade_sn'],//平台
// 'meepay_trade_no' => $data['meepay_trade_no'],//米付
// 'pay_time' => date('Y-m-d H:i:s', $data['pay_time']),// 支付完成时间
// 'amount' => $data['total_amount'],
// 'trade_type' => $data['trade_type'],
// 'transaction_id' => $data['transaction_id'],//微信
// 'trade_state' => strtolower($data['result_code']),
// 'channel' => Config::MI_CHARGE,
// ];
// return $retData;
$data = json_decode($params['signContent'],true);
// Array
// (
// [buyerName] => oAFzv5a67bJ0aGk7cB-RfK0Yap8s //openid
// [channelOrderNo] => 23050815371110591231100592117922 //请求渠道商户订单号
// [finishedDate] => 20230508153801
// [fundBankCode] => OTHERS
// [fundChannel] => OTHERS
// [goodsInfo] => 支付测试
// [memo] => {"openid":"oAFzv5a67bJ0aGk7cB-RfK0Yap8s","appid":"wxfbe753bb28212636","latitude":"22.33","spbillCreateIp":"150.158.53.11","paylimit":"no_credit","longitude":"171.21"}
// [orderAmt] => 1
// [orderStatus] => SUCCESS
// [payOrderNo] => 4200001871202305087489820896 //渠道交易单号(支付宝/微信/银联返回的交易号)
// [payType] => WECHAT_APPLET
// [requestDate] => 20230508153751
// [respCode] => 000000
// [respMsg] => 交易成功
// [tradeNo] => 25000020230420101055003876003836 //交易订单号(慧收钱系统交易订单号)
// [transNo] => WechatPay20230508153751 //商户订单号(原支付交易对应的商户订单号)
// )
$retData = [
'openid' => $data['buyerName'],
'order_no' => $data['transNo'],
'transaction_id' => $data['tradeNo'],
'amount' => $data['orderAmt'],
'outtrxid' => $data['channelOrderNo'],
'chnltrxid'=> $data['payOrderNo'],
'channel' => Config::HSQ_CHARGE,
];
return $retData;
}
/**
......
src/Notify/NotifyStrategy.php
......@@ -46,12 +46,13 @@ abstract class NotifyStrategy
// 检查异步通知返回的数据是否有误
$checkRet = $this->checkNotifyData($notifyData);
// if ($checkRet === false) {// 失败，就返回错误
// return $this->replyNotify(false, '返回数据验签失败，可能数据被篡改');
// }
if ($checkRet === false) {// 失败，就返回错误
return $this->replyNotify(false, '返回数据验签失败，可能数据被篡改');
}
// 回调商户的业务逻辑
$flag = $this->callback($notify, $notifyData);
if ($flag) {
$msg = 'OK';
} else {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!