feat: update

composer.json

 {
 {
     "name": "ldy/payment",
     "name": "ldy/payment",
     "type": "library",
     "type": "library",
-    "version": "3.6.6",
+    "version": "3.6.7",
     "description": "支付宝支付、微信支付、招商一网通支付、通联支付、米付支付、利楚扫呗、富友支付、联拓付、易生支付、银盛支付、微诺付、汇收钱 php SDK。",
     "description": "支付宝支付、微信支付、招商一网通支付、通联支付、米付支付、利楚扫呗、富友支付、联拓付、易生支付、银盛支付、微诺付、汇收钱 php SDK。",
     "keywords": ["alipay", "weixin", "支付宝支付", "微信支付","通联支付", "集成支付接口SDK", "招商一网通", "一网通", "利楚扫呗", "富友支付","微诺付","汇收钱"],
     "keywords": ["alipay", "weixin", "支付宝支付", "微信支付","通联支付", "集成支付接口SDK", "招商一网通", "一网通", "利楚扫呗", "富友支付","微诺付","汇收钱"],
     "homepage": "",
     "homepage": "",

src/Common/Weixin/Data/Charge/WapChargeData.php

@@ -37,28 +37,29 @@ class WapChargeData extends ChargeBaseData
         $sceneInfo['h5_info'] = $info;
         $sceneInfo['h5_info'] = $info;
 
 
         $signData = [
         $signData = [
-            // 基本数据
+
             'appid' => trim($this->appId),
             'appid' => trim($this->appId),
             'mch_id'    => trim($this->mchId),
             'mch_id'    => trim($this->mchId),
             'nonce_str' => $this->nonceStr,
             'nonce_str' => $this->nonceStr,
-            'notify_url'    => $this->notifyUrl,
-            'amount' => $this->amount,
-            'out_trade_no'  => trim($this->order_no),
-            'description'  => trim($this->subject),
-            'time_expire'   => $this->timeout_express,
-            'attach'    => trim($this->return_param),
-            'scene_info' => json_encode($sceneInfo),
-
             'sign_type' => $this->signType,
             'sign_type' => $this->signType,
             'fee_type'  => $this->feeType,
             'fee_type'  => $this->feeType,
+            'notify_url'    => $this->notifyUrl,
             'trade_type'    => $this->tradeType, //设置APP支付
             'trade_type'    => $this->tradeType, //设置APP支付
             'limit_pay' => $this->limitPay,  // 指定不使用信用卡
             'limit_pay' => $this->limitPay,  // 指定不使用信用卡
-//             业务数据
+            'scene_info' => json_encode($sceneInfo),
+
+            // 业务数据
             'device_info'   => $this->terminal_id,
             'device_info'   => $this->terminal_id,
-            'detail' => json_encode($this->body, JSON_UNESCAPED_UNICODE),
+            'body'  => trim($this->subject),
+            //'detail' => json_encode($this->body, JSON_UNESCAPED_UNICODE);
+            'attach'    => trim($this->return_param),
+            'out_trade_no'  => trim($this->order_no),
+            'total_fee' => $this->amount,
             'spbill_create_ip'  => trim($this->client_ip),
             'spbill_create_ip'  => trim($this->client_ip),
             'time_start'    => $this->timeStart,
             'time_start'    => $this->timeStart,
-
+            'time_expire'   => $this->timeout_express,
+            'openid' => $this->openid,
+            'product_id'    => $this->product_id,
 
 
         ];
         ];
 
 

src/Notify/AliNotify.php

@@ -111,8 +111,8 @@ class AliNotify extends NotifyStrategy
                 'pay_time'   => $data['gmt_payment'],// 交易付款时间
                 'pay_time'   => $data['gmt_payment'],// 交易付款时间
                 'seller_id' => $data['seller_id'],
                 'seller_id' => $data['seller_id'],
                 'seller_email' => $data['seller_email'],
                 'seller_email' => $data['seller_email'],
-                'buyer_id'   => $data['buyer_id'],
-                'amount'   => $data['total_fee'],
+                'buyer_id'   => $data['buyer_id']??$data['buyer_open_id'],
+                'amount'   => $data['amount'],
                 'channel'   => Config::ALI_CHARGE,
                 'channel'   => Config::ALI_CHARGE,
                 'body'   => $data['body'],
                 'body'   => $data['body'],
                 'discount' => $data['discount'],
                 'discount' => $data['discount'],
@@ -123,7 +123,7 @@ class AliNotify extends NotifyStrategy
         } else {
         } else {
             $retData = [
             $retData = [
                 'amount'   => $data['total_amount'],
                 'amount'   => $data['total_amount'],
-                'buyer_id'   => $data['buyer_id'],
+                'buyer_id'   => $data['buyer_id']??$data['buyer_open_id'],
                 'transaction_id'   => $data['trade_no'],
                 'transaction_id'   => $data['trade_no'],
                 'body'   => $data['body'],
                 'body'   => $data['body'],
                 'notify_time'   => $data['notify_time'],
                 'notify_time'   => $data['notify_time'],