From 71cadc6f9baf636253d70abfe15381ee4ff0b2ea Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Tue, 22 Sep 2020 18:51:20 +0800
Subject: [PATCH] =?UTF-8?q?iepay=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/payment/IEPayAliPay.php |  2 +-
 extend/payment/IEPayWeixin.php | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/extend/payment/IEPayAliPay.php b/extend/payment/IEPayAliPay.php
index 4a9f18794..85d1393a8 100644
--- a/extend/payment/IEPayAliPay.php
+++ b/extend/payment/IEPayAliPay.php
@@ -136,7 +136,7 @@ class IEPayAliPay
         ];
 
         // 是否人民币结算
-        if(isset($this->config['is_rmb_pay']) && $this->config['is_rmb_pay'] == 1 && in_array($parameter['pay_type'], ['IE0012', 'IE0013']))
+        if(isset($this->config['is_rmb_pay']) && $this->config['is_rmb_pay'] == 1)
         {
             $parameter['rmb_fee'] = (int) (($params['total_price']*1000)/10);
             unset($parameter['total_fee']);
diff --git a/extend/payment/IEPayWeixin.php b/extend/payment/IEPayWeixin.php
index c3f48abff..d53747cdc 100644
--- a/extend/payment/IEPayWeixin.php
+++ b/extend/payment/IEPayWeixin.php
@@ -90,6 +90,18 @@ class IEPayWeixin
                 'is_required'   => 0,
                 'message'       => '请填写微信分配的小程序ID',
             ],
+            [
+                'element'       => 'select',
+                'title'         => '支付RMB定价',
+                'desc'          => '默认否（仅[PC/H5]端支付宝支付有效）',
+                'message'       => '请选择支付RMB定价',
+                'name'          => 'is_rmb_pay',
+                'is_multiple'   => 0,
+                'element_data'  => [
+                    ['value'=>0, 'name'=>'否'],
+                    ['value'=>1, 'name'=>'是'],
+                ],
+            ],
         ];
 
         return [
@@ -133,6 +145,13 @@ class IEPayWeixin
             'version'           => 'v1',
         ];
 
+        // 是否人民币结算
+        if(isset($this->config['is_rmb_pay']) && $this->config['is_rmb_pay'] == 1)
+        {
+            $parameter['rmb_fee'] = (int) (($params['total_price']*1000)/10);
+            unset($parameter['total_fee']);
+        }
+
         // 微信小程序
         if($parameter['pay_type'] == 'IE0026')
         {