From 96f600402a56aa417b1d60f4a79f00e1f7b9ba5d Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Wed, 23 Sep 2020 18:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/OrderCurrencyService.php | 22 ++++----------------
 application/service/OrderService.php         |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/application/service/OrderCurrencyService.php b/application/service/OrderCurrencyService.php
index 6f13b410e..bf84e9e12 100644
--- a/application/service/OrderCurrencyService.php
+++ b/application/service/OrderCurrencyService.php
@@ -59,28 +59,14 @@ class OrderCurrencyService
      * @version 1.0.0
      * @date    2020-09-17
      * @desc    description
-     * @param   [array|int]          $order_value [订单id或者编号]
-     * @param   [string]             $order_key   [订单主键字段名称(order_id|order_no)(默认order_id)]
+     * @param   [array|int]          $order_ids [订单id]
      * @return  [array]                         [货币数据、参数是多个id则返回二维数组，一个id则返回一维数组]
      */
-    public static function OrderCurrencyGroupList($order_value, $order_key = 'order_id')
+    public static function OrderCurrencyGroupList($order_ids)
     {
-        // 是否订单编号
-        if($order_key == 'order_no')
-        {
-            // 数组读取多个id，则读取单个订单id
-            if(is_array($order_value))
-            {
-                $order_value = Db::name('OrderCurrency')->where(['order_no'=>$order_value])->column('id');
-            } else {
-                $order_value = Db::name('OrderCurrency')->where(['order_no'=>$order_value])->value('id');
-            }
-        }
-
-        // 数据处理
-        $data = Db::name('OrderCurrency')->where(['order_id'=>$order_value])->select();
+        $data = Db::name('OrderCurrency')->where(['order_id'=>$order_ids])->select();
         $result = [];
-        if(!empty($data) && is_array($order_value) && count($order_value) > 1)
+        if(!empty($data) && is_array($order_ids))
         {
             foreach($data as $v)
             {
diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index 5a6a5af47..9210aabed 100755
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -604,7 +604,7 @@ class OrderService
         }
         if($pay_log_data['status'] == 1)
         {
-            return DataReturn('日志订单已支付、无需再次处理', 0);
+            return DataReturn('日志订单已支付、无需重复处理', 0);
         }
 
         // 获取关联信息