feat: 调整公众号支付

src/Common/Fu/Data/BackPubChargeData.php

@@ -12,6 +12,8 @@ class BackPubChargeData extends FuBaseData
     public function getData()
     public function getData()
     {
     {
         $data = [];
         $data = [];
+        //TODO: 貌似不需要根据订单类型判断，返回参数中存在 reserved_pay_info 字段，该字段为JSON字符串，与发起支付时所需要参数相同，可以直接根据该字段值返回package
+        if (!empty($this->reserved_pay_info)) {
             switch ($this->trade_type) {
             switch ($this->trade_type) {
                 case 'JSAPI': //微信公众号
                 case 'JSAPI': //微信公众号
                 case 'LETPAY': //小程序
                 case 'LETPAY': //小程序
@@ -31,12 +33,12 @@ class BackPubChargeData extends FuBaseData
                     break;
                     break;
                 default:
                 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,27 +18,31 @@ class BackPubChargeData extends SwBaseData
     public function getData()
     public function getData()
     {
     {
         $data = [];
         $data = [];
-        switch ($this->pay_type){
-            case '010':{ //微信
+        switch ($this->pay_type) {
+            case '010':
+                { //微信
                     $data = [
                     $data = [
                         'appId' => $this->appId,
                         'appId' => $this->appId,
-                    'timeStamp' => time() . '',
+                        'timeStamp' => $this->timeStamp,
                         'nonceStr' => $this->nonceStr,
                         'nonceStr' => $this->nonceStr,
                         'package' => $this->package_str,
                         'package' => $this->package_str,
-                    'signType'  => $this->signType,// 签名算法，暂支持MD5
+                        'signType' => $this->signType, // 签名算法，暂支持MD5
+                        'paySign' => $this->paySign
                     ];
                     ];
 
 
                     break;
                     break;
                 }
                 }
 
 
-            case '020':{ //支付宝
+            case '020':
+                { //支付宝
                     $data = [
                     $data = [
                         'ali_trade_no' => $this->ali_trade_no,
                         'ali_trade_no' => $this->ali_trade_no,
                     ];
                     ];
 
 
                     break;
                     break;
                 }
                 }
-            case '060':{
+            case '060':
+                {
                     $data = [
                     $data = [
                         'token_id' => $this->token_id,
                         'token_id' => $this->token_id,
                     ];
                     ];