Skip to content

ldy / payment

Go to a project
Commit 389be2d9 by wangyu
Options

feat: 调整公众号支付

1 parent d0622ee2
Inline Side-by-side
Showing with 49 additions and 43 deletions
src/Common/Fu/Data/BackPubChargeData.php
...@@ -12,31 +12,33 @@ class BackPubChargeData extends FuBaseData ...@@ -12,31 +12,33 @@ class BackPubChargeData extends FuBaseData
public function getData() public function getData()
{ {
$data = []; $data = [];
switch ($this->trade_type) { //TODO: 貌似不需要根据订单类型判断，返回参数中存在 reserved_pay_info 字段，该字段为JSON字符串，与发起支付时所需要参数相同，可以直接根据该字段值返回package
case 'JSAPI': //微信公众号 if (!empty($this->reserved_pay_info)) {
case 'LETPAY': //小程序 switch ($this->trade_type) {
$data = [ case 'JSAPI': //微信公众号
'appId' => $this->subAppid ?? $this->sdk_appid, case 'LETPAY': //小程序
'timeStamp' => $this->sdk_timestamp ?? time(), $data = [
'nonceStr' => $this->sdk_noncestr, 'appId' => $this->subAppid ?? $this->sdk_appid,
'package' => $this->sdk_package, 'timeStamp' => $this->sdk_timestamp ?? time(),
'signType' => $this->sdk_signtype, 'nonceStr' => $this->sdk_noncestr,
'paySign' => $this->sdk_paysign 'package' => $this->sdk_package,
]; 'signType' => $this->sdk_signtype,
break; 'paySign' => $this->sdk_paysign
case 'FWC': ];
$data = [ break;
'transaction_id' => $this->reserved_transaction_id case 'FWC':
]; $data = [
break; 'transaction_id' => $this->reserved_transaction_id
default: ];
break;
default:
}
} }
$this->retData['package'] = $data; $this->retData['package'] = !empty($this->reserved_pay_info) ? json_decode($this->reserved_pay_info, true) : $data;
$this->retData['other'] = [ $this->retData['other'] = [
'out_trade_no' => $this->reserved_fy_order_no ?: '', 'out_trade_no' => $this->reserved_fy_order_no ?: '',
'attach' => $this->reserved_addn_inf ?: '' 'attach' => $this->reserved_addn_inf ?: ''
]; ];
return parent::getData(); return parent::getData();
} }
......
src/Common/Sw/Data/BackPubChargeData.php
...@@ -18,33 +18,37 @@ class BackPubChargeData extends SwBaseData ...@@ -18,33 +18,37 @@ class BackPubChargeData extends SwBaseData
public function getData() public function getData()
{ {
$data = []; $data = [];
switch ($this->pay_type){ switch ($this->pay_type) {
case '010':{ //微信 case '010':
$data = [ { //微信
'appId' => $this->appId, $data = [
'timeStamp' => time() . '', 'appId' => $this->appId,
'nonceStr' => $this->nonceStr, 'timeStamp' => $this->timeStamp,
'package' => $this->package_str, 'nonceStr' => $this->nonceStr,
'signType' => $this->signType,// 签名算法，暂支持MD5 'package' => $this->package_str,
]; 'signType' => $this->signType, // 签名算法，暂支持MD5
'paySign' => $this->paySign
];
break; break;
} }
case '020':{ //支付宝 case '020':
$data = [ { //支付宝
'ali_trade_no' => $this->ali_trade_no, $data = [
]; 'ali_trade_no' => $this->ali_trade_no,
];
break; break;
} }
case '060':{ case '060':
$data = [ {
'token_id' => $this->token_id, $data = [
]; 'token_id' => $this->token_id,
];
break; break;
} }
} }
$this->retData['jspackage'] = $data; $this->retData['jspackage'] = $data;
$this->retData['other'] = [ $this->retData['other'] = [
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!