Merge branch 'master' of https://git.yidian-inc.com:8021/bp/pay

application/services/pay/PayService.php

@@ -64,6 +64,7 @@ class PayService
 
         $metadata = [
             'app_id'=>'merchant-c',
+            'pingxx_id'=>PingxxService::getInstance()->getAppId(),
             'environ'=>Application::app()->environ(),
             'order_id'=>$order_id,
             'goods'=>[],

application/services/pingxx/PingxxService.php

@@ -33,6 +33,9 @@ class PingxxService
         return self::$instance;
     }
 
+    public function getAppId() {
+        return Pingpp::getAppId();
+    }
 
     /**
      * @param $order_item_id

application/services/refund/RefundService.php

@@ -64,6 +64,7 @@ class RefundService
             'charge_amount'=>$data['refund_order']['refund_amount'],
             'metadata' => [
                 'app_id'=>'merchant-c',
+                'pingxx_id'=>PingxxService::getInstance()->getAppId(),
                 'environ'=>Application::app()->environ(),
                 'refund_order_id'=>$data['refund_order']['refund_order_id'],
                 'order_item_id'=>$data['order_item_id'],