Commit f2fea08c by Administrator

Merge branch 'master' into 'dev_huishouqian'

# Conflicts:
#   src/Notify/NotifyStrategy.php
2 parents 035e2785 523a47b3
{ {
"name": "ldy/payment", "name": "ldy/payment",
"type": "library", "type": "library",
"version": "3.5.4", "version": "3.6.2",
"description": "支付宝支付、微信支付、招商一网通支付、通联支付、米付支付、利楚扫呗、富友支付、联拓付、易生支付、银盛支付、微诺付 php SDK。", "description": "支付宝支付、微信支付、招商一网通支付、通联支付、米付支付、利楚扫呗、富友支付、联拓付、易生支付、银盛支付、微诺付、汇收钱 php SDK。",
"keywords": ["alipay", "weixin", "支付宝支付", "微信支付","通联支付", "集成支付接口SDK", "招商一网通", "一网通", "利楚扫呗", "富友支付","微诺付"], "keywords": ["alipay", "weixin", "支付宝支付", "微信支付","通联支付", "集成支付接口SDK", "招商一网通", "一网通", "利楚扫呗", "富友支付","微诺付","汇收钱"],
"homepage": "", "homepage": "",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
......
...@@ -116,4 +116,4 @@ abstract class NotifyStrategy ...@@ -116,4 +116,4 @@ abstract class NotifyStrategy
* *
*/ */
abstract protected function replyNotify($flag, $msg = 'OK'); abstract protected function replyNotify($flag, $msg = 'OK');
} }
\ No newline at end of file
...@@ -144,6 +144,9 @@ class WxNotify extends NotifyStrategy ...@@ -144,6 +144,9 @@ class WxNotify extends NotifyStrategy
'trade_state' => strtolower($data['return_code']), 'trade_state' => strtolower($data['return_code']),
'channel' => Config::WX_CHARGE, 'channel' => Config::WX_CHARGE,
]; ];
if (!empty($data['coupon_fee'])) {
$retData['coupon_fee'] = $data['coupon_fee'];
}
if (!empty($data['sub_appid'])) { if (!empty($data['sub_appid'])) {
$retData['sub_appid'] = $data['sub_appid']; $retData['sub_appid'] = $data['sub_appid'];
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!