From 4335e662251665d40bf7170460baf8d137197919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= <hwq@hainatravel.com>
Date: Wed, 29 May 2024 15:59:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CH=E6=88=90=E6=9C=AC=E5=B8=81=E7=A7=8D?=
 =?UTF-8?q?=E6=8D=A2=E7=AE=97=E6=88=90=E7=94=A8=E7=BE=8E=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 433ebe00..1e4e43ad 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1603,6 +1603,7 @@ class Information extends CI_Controller
             }
           }
         }
+		$price_number = $this->currency->convert_moneny_by_char($price_number,"USD");
         $site_money = $this->currency->calc_show_price($price_number);
         //把金额格式化为带有逗号(,)方便阅读，如 12,345
         $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;

From 1c8ef378e6d8f33acd25e87b1b5b4d82d4c6c0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= <hwq@hainatravel.com>
Date: Wed, 29 May 2024 17:06:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CH=E6=88=90=E6=9C=AC=E6=8D=A2=E7=AE=97?=
 =?UTF-8?q?=E6=88=90=E7=BE=8E=E5=85=83=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AFch=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 1e4e43ad..a74213d5 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1603,7 +1603,9 @@ class Information extends CI_Controller
             }
           }
         }
-		$price_number = $this->currency->convert_moneny_by_char($price_number,"USD");
+		if($dept_sn == 1){
+          $price_number = $this->currency->convert_moneny_by_char($price_number,"USD");
+        }
         $site_money = $this->currency->calc_show_price($price_number);
         //把金额格式化为带有逗号(,)方便阅读，如 12,345
         $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;