fix sw qrcode charge buildData

src/Common/SwThree/Data/Charge/ScanChargeData.php

@@ -45,17 +45,10 @@ class ScanChargeData extends ChargeBaseData
             'terminal_trace'  => $this->terminal_trace,
             'terminal_time' => $this->terminal_time,
             'total_fee'     => $this->total_fee,  // 金额，单位分
-
-//           'time_expire'   => $this->timeout_express,
-
         ];
 
         $signData = array_merge($this->certainSignData,[]);
 
-        if(isset($this->sub_appid)){
-            $signData['sub_appid'] = $this->sub_appid;
-        }
-
         if(isset($this->order_body)){
             $signData['order_body'] = $this->order_body;
         }
@@ -65,13 +58,15 @@ class ScanChargeData extends ChargeBaseData
         if(isset($this->attach)){
             $signData['attach'] =  $this->attach;
         }
-        if(isset($this->goods_detail)){
-            $signData['goods_detail'] =  $this->goods_detail;
 
-            //goods_Id	String	N	商品编号
-            //goods_name	String	N	商品名称
-            //quantity	String	N	商品数量
-            //price	String	N	商品单价，单位为分
+        // 链接失效时间 单位s。取值范围：1～7200的整数，不传默认7200s
+        if(isset($this->timeout_express)) {
+            $signData['timeout_express'] = $this->timeout_express;
+        }
+
+        // 是否允许重复扫码或支付 0或不传:允许重复扫码或支付; 1:不允许重复扫码或支付; 2:允许terminal_trace值不变，但terminal_time值变化时，多次请求该接口生成收款码
+        if (isset($this->repeated_trace)) {
+            $signData['repeated_trace'] =  $this->repeated_trace;
         }
 
         // 移除数组中的空值