From e0ddbe1a48ba437ee38863304b5ed227282e96f7 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 13 Nov 2023 14:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=BD=AC=E5=B9=B3=E5=8F=B0=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=20=20=E6=AF=94=E4=BE=8B=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/user/User.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php
index 2a6e14e..8c768ff 100644
--- a/app/controller/api/user/User.php
+++ b/app/controller/api/user/User.php
@@ -9,6 +9,7 @@ namespace app\controller\api\user;
 use app\common\repositories\store\IntegralRepository;
 use app\common\repositories\store\service\StoreServiceRepository;
 use app\common\repositories\system\CacheRepository;
+use app\common\repositories\system\merchant\MerchantRepository;
 use app\common\repositories\user\IntegralGiveRecordRepository;
 use app\common\repositories\user\MemberinterestsRepository;
 use app\common\repositories\user\UserBillRepository;
@@ -463,7 +464,7 @@ class User extends BaseController
         // 转换操作
         try {
             Db::transaction(function () use ($merId, $convertIntegral) {
-                $mer_integral_platform_rate = (float)merchantConfig($merId,'mer_integral_platform_rate');
+                $mer_integral_platform_rate = (float)app()->make(MerchantRepository::class)->getSearch(['mer_id' => $merId])->value('mer_integral_platform_rate');
                 if($mer_integral_platform_rate <= 0) throw new Exception('转换失败，商户未设置转换比例！');
                 $uid = $this->request->uid();
                 $user = app()->make(UserRepository::class)->get($uid);