From 888ade739cf457b27c57d30a7ec8e5f194b6da54 Mon Sep 17 00:00:00 2001 From: devil Date: Fri, 25 Sep 2020 12:37:41 +0800 Subject: [PATCH] =?UTF-8?q?iepay=E6=94=AF=E4=BB=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/payment/IEPayAliPay.php | 97 ++-------------------------------- extend/payment/IEPayWeixin.php | 97 ++-------------------------------- 2 files changed, 6 insertions(+), 188 deletions(-) diff --git a/extend/payment/IEPayAliPay.php b/extend/payment/IEPayAliPay.php index 582618bd9..57300b7f3 100644 --- a/extend/payment/IEPayAliPay.php +++ b/extend/payment/IEPayAliPay.php @@ -80,18 +80,6 @@ class IEPayAliPay 'is_required' => 0, 'message' => '请填写密钥', ], - [ - 'element' => 'select', - 'title' => '支付金额转换', - 'desc' => '默认否（将金额转为原始汇率的金额、仅单个订单发起支付的时候有效）', - 'message' => '请选择订单金额转换', - 'name' => 'is_reverse_price', - 'is_multiple' => 0, - 'element_data' => [ - ['value'=>0, 'name'=>'否'], - ['value'=>1, 'name'=>'是'], - ], - ], ]; return [ @@ -123,22 +111,6 @@ class IEPayAliPay return DataReturn('支付缺少配置', -1); } - // 金额转换 - if(isset($this->config['is_reverse_price']) && $this->config['is_reverse_price'] == 1 && !empty($params['business_ids']) && is_array($params['business_ids']) && count($params['business_ids']) == 1 && !empty($params['business_type'])) - { - switch($params['business_type']) - { - // 订单 - case 'system-order' : - $currency_data = \app\service\OrderCurrencyService::OrderCurrencyGroupList($params['business_ids'][0]); - if(isset($currency_data['currency_rate']) && $currency_data['currency_rate'] > 0) - { - $params['total_price'] /= $currency_data['currency_rate']; - } - break; - } - } - // 支付参数 $parameter = [ 'mid' => $this->config['mid'], @@ -256,50 +228,11 @@ class IEPayAliPay $data['buyer_user'] = $data['pay_type']; // 支付平台 - 用户 $data['out_trade_no'] = $data['out_trade_no']; // 本系统发起支付的 - 订单号 $data['subject'] = isset($data['order_status']) ? '状态:'.$data['order_status'] : ''; // 本系统发起支付的 - 商品名称 - $data['pay_price'] = $this->RespondReversePrice($data['out_trade_no'], $data['total_fee']); // 本系统发起支付的 - 总价 + $data['pay_price'] = $data['total_fee']/100; // 本系统发起支付的 - 总价 return $data; } - /** - * 金额转换 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2020-09-23 - * @desc description - * @param [string] $out_trade_no [支付日志订单号] - * @param [float] $total_fee [平台返回的支付金额] - */ - private function RespondReversePrice($out_trade_no, $total_fee) - { - $total_fee /= 100; - - // 金额转换 - if(isset($this->config['is_reverse_price']) && $this->config['is_reverse_price'] == 1) - { - // 获取订单信息 - $log_data = \app\service\PayLogService::PayLogList(['where'=>['log_no'=>$out_trade_no]]); - if($log_data['code'] == 0 && !empty($log_data['data']) && !empty($log_data['data'][0]) && !empty($log_data['data'][0]['business_list']) && count($log_data['data'][0]['business_list']) == 1) - { - switch($log_data['data'][0]['business_type']) - { - // 订单 - case \app\service\OrderService::$business_type_name : - // 获取订单汇率 - $currency_data = \app\service\OrderCurrencyService::OrderCurrencyGroupList($log_data['data'][0]['business_list'][0]['business_id']); - if(isset($currency_data['currency_rate']) && $currency_data['currency_rate'] > 0) - { - $total_fee *= $currency_data['currency_rate']; - } - break; - } - } - } - - return PriceNumberFormat($total_fee); - } - /** * 退款处理 * @author Devil @@ -340,37 +273,13 @@ class IEPayAliPay return DataReturn($ret, -1); } - // 退款金额 - $refund_price = $params['refund_price']; - - // 金额转换 - if(isset($this->config['is_reverse_price']) && $this->config['is_reverse_price'] == 1) - { - // 获取订单信息 - $log_data = \app\service\PayLogService::PayLogList(['where'=>['log_no'=>$params['order_no']]]); - if($log_data['code'] == 0 && !empty($log_data['data']) && !empty($log_data['data'][0]) && !empty($log_data['data'][0]['business_list']) && count($log_data['data'][0]['business_list']) == 1) - { - switch($log_data['data'][0]['business_type']) - { - // 订单 - case \app\service\OrderService::$business_type_name : - // 获取订单汇率 - $currency_data = \app\service\OrderCurrencyService::OrderCurrencyGroupList($log_data['data'][0]['business_list'][0]['business_id']); - if(isset($currency_data['currency_rate']) && $currency_data['currency_rate'] > 0) - { - $refund_price /= $currency_data['currency_rate']; - } - break; - } - } - } - // 远程查询支付状态 $parameter = [ 'mid' => $this->config['mid'], 'pay_type' => $this->GetPayType($params['client_type']), 'out_trade_no' => $params['order_no'], - 'refund_amount' => (int) ((PriceNumberFormat($refund_price)*1000)/10), + 'refund_amount' => (int) (($params['refund_price']*1000)/10), + 'refund_charge_fee' => 'TRUE', 'version' => 'v1', ]; diff --git a/extend/payment/IEPayWeixin.php b/extend/payment/IEPayWeixin.php index 3efc795a9..6d1f87548 100644 --- a/extend/payment/IEPayWeixin.php +++ b/extend/payment/IEPayWeixin.php @@ -90,18 +90,6 @@ class IEPayWeixin 'is_required' => 0, 'message' => '请填写微信分配的小程序ID', ], - [ - 'element' => 'select', - 'title' => '支付金额转换', - 'desc' => '默认否（将金额转为原始汇率的金额、仅单个订单发起支付的时候有效）', - 'message' => '请选择订单金额转换', - 'name' => 'is_reverse_price', - 'is_multiple' => 0, - 'element_data' => [ - ['value'=>0, 'name'=>'否'], - ['value'=>1, 'name'=>'是'], - ], - ], ]; return [ @@ -133,22 +121,6 @@ class IEPayWeixin return DataReturn('支付缺少配置', -1); } - // 金额转换 - if(isset($this->config['is_reverse_price']) && $this->config['is_reverse_price'] == 1 && !empty($params['business_ids']) && is_array($params['business_ids']) && count($params['business_ids']) == 1 && !empty($params['business_type'])) - { - switch($params['business_type']) - { - // 订单 - case 'system-order' : - $currency_data = \app\service\OrderCurrencyService::OrderCurrencyGroupList($params['business_ids'][0]); - if(isset($currency_data['currency_rate']) && $currency_data['currency_rate'] > 0) - { - $params['total_price'] /= $currency_data['currency_rate']; - } - break; - } - } - // 支付参数 $parameter = [ 'mid' => $this->config['mid'], @@ -358,50 +330,11 @@ class IEPayWeixin $data['buyer_user'] = $data['pay_type']; // 支付平台 - 用户 $data['out_trade_no'] = $data['out_trade_no']; // 本系统发起支付的 - 订单号 $data['subject'] = isset($data['order_status']) ? '状态:'.$data['order_status'] : ''; // 本系统发起支付的 - 商品名称 - $data['pay_price'] = $this->RespondReversePrice($data['out_trade_no'], $data['total_fee']); // 本系统发起支付的 - 总价 + $data['pay_price'] = $data['total_fee']/100; // 本系统发起支付的 - 总价 return $data; } - /** - * 金额转换 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2020-09-23 - * @desc description - * @param [string] $out_trade_no [支付日志订单号] - * @param [float] $total_fee [平台返回的支付金额] - */ - private function RespondReversePrice($out_trade_no, $total_fee) - { - $total_fee /= 100; - - // 金额转换 - if(isset($this->config['is_reverse_price']) && $this->config['is_reverse_price'] == 1) - { - // 获取订单信息 - $log_data = \app\service\PayLogService::PayLogList(['where'=>['log_no'=>$out_trade_no]]); - if($log_data['code'] == 0 && !empty($log_data['data']) && !empty($log_data['data'][0]) && !empty($log_data['data'][0]['business_list']) && count($log_data['data'][0]['business_list']) == 1) - { - switch($log_data['data'][0]['business_type']) - { - // 订单 - case \app\service\OrderService::$business_type_name : - // 获取订单汇率 - $currency_data = \app\service\OrderCurrencyService::OrderCurrencyGroupList($log_data['data'][0]['business_list'][0]['business_id']); - if(isset($currency_data['currency_rate']) && $currency_data['currency_rate'] > 0) - { - $total_fee *= $currency_data['currency_rate']; - } - break; - } - } - } - - return PriceNumberFormat($total_fee); - } - /** * 退款处理 * @author Devil @@ -442,37 +375,13 @@ class IEPayWeixin return DataReturn($ret, -1); } - // 退款金额 - $refund_price = $params['refund_price']; - - // 金额转换 - if(isset($this->config['is_reverse_price']) && $this->config['is_reverse_price'] == 1) - { - // 获取订单信息 - $log_data = \app\service\PayLogService::PayLogList(['where'=>['log_no'=>$params['order_no']]]); - if($log_data['code'] == 0 && !empty($log_data['data']) && !empty($log_data['data'][0]) && !empty($log_data['data'][0]['business_list']) && count($log_data['data'][0]['business_list']) == 1) - { - switch($log_data['data'][0]['business_type']) - { - // 订单 - case \app\service\OrderService::$business_type_name : - // 获取订单汇率 - $currency_data = \app\service\OrderCurrencyService::OrderCurrencyGroupList($log_data['data'][0]['business_list'][0]['business_id']); - if(isset($currency_data['currency_rate']) && $currency_data['currency_rate'] > 0) - { - $refund_price /= $currency_data['currency_rate']; - } - break; - } - } - } - // 远程查询支付状态 $parameter = [ 'mid' => $this->config['mid'], 'pay_type' => $this->GetPayType($params['client_type']), 'out_trade_no' => $params['order_no'], - 'refund_amount' => (int) ((PriceNumberFormat($refund_price)*1000)/10), + 'refund_amount' => (int) (($params['refund_price']*1000)/10), + 'refund_charge_fee' => 'TRUE', 'version' => 'v1', ]; -- GitLab