From 23e0470ce4d9dc74cc34218ec30ea9b3eda287fb Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 5 Feb 2018 12:01:33 +0800
Subject: [PATCH] =?UTF-8?q?alipay=20=E4=BA=BA=E6=B0=91=E5=B8=81=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9C=A8=E5=BD=95=E5=85=A5=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=E7=94=B1CNY=E6=94=B9=E6=88=90RMB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/AlipayTradeService.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index 0724ef10..4b7aebe4 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -368,6 +368,7 @@ class AlipayTradeService extends CI_Controller
             //添加支付信息入库
             //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据
             if (!empty($orderid_info)) {
+                $currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->ALI_currencyCode)));
                 //更新还没有填的客邮和交易号de收款记录（商务订单）
                 if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) {
                     $ht_memo = '交易号(自动录入):' . $item->ALI_dealId;
@@ -385,7 +386,7 @@ class AlipayTradeService extends CI_Controller
                             $advisor_info->COLI_ID,
                             $item->ALI_orderAmount,
                             $item->ALI_completeTime,
-                            mb_strtoupper($item->ALI_currencyCode),
+                            $currencyCode,
                             $item->ALI_completeTime,
                             $item->ALI_completeTime,
                             $item->ALI_acquiringTime,
@@ -404,7 +405,7 @@ class AlipayTradeService extends CI_Controller
                         $GAI_COLI_SN,
                         $item->ALI_orderAmount,
                         $item->ALI_acquiringTime,
-                        mb_strtoupper($item->ALI_currencyCode),
+                        $currencyCode,
                         $item->ALI_completeTime,
                         $item->ALI_completeTime,
                         $item->ALI_acquiringTime,
@@ -476,7 +477,7 @@ class AlipayTradeService extends CI_Controller
         }
         $response = $this->Query($this->AlipayTradeQueryContentBuilder);
         if (  strcmp(trim($response->code), "10000")) {
-            log_message('error',"Alipay payment failed! error code:".$response->code."; result Msg: ".$response->msg.'; orderId:'.$response->out_trade_no.'; dealId:'.$response->trade_no."; ");
+            log_message('error',"Alipay query failed! error code:".$response->code."; result Msg: ".$response->msg.'; orderId:'.$response->out_trade_no.'; dealId:'.$response->trade_no."; ");
         }
         $html = '<table>';
         foreach ($response as $key => $value) {