From 0f5e731d0cc27d6bbaca1c99ee811743371c4b80 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 1 Jul 2024 16:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E6=83=A0=E6=B0=91?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/user/ExchangeQuotaDao.php       |  3 +++
 app/common/dao/user/ExchangeQuotaRecordDao.php |  3 +++
 app/common/model/user/ExchangeQuota.php        | 12 +++++++-----
 app/common/model/user/ExchangeQuotaRecord.php  |  5 ++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/common/dao/user/ExchangeQuotaDao.php b/app/common/dao/user/ExchangeQuotaDao.php
index d1de59b..7fec0af 100644
--- a/app/common/dao/user/ExchangeQuotaDao.php
+++ b/app/common/dao/user/ExchangeQuotaDao.php
@@ -39,6 +39,9 @@ class ExchangeQuotaDao extends BaseDao{
                 'user'     => function($query){
                     $query->field('uid,nickname,avatar')->bind(['nickname','avatar']);
                 },
+                'mer'      => function($query){
+                    $query->field('mer_id,mer_name,mer_avatar');
+                },
             ])
             ->order('create_time DESC,id DESC');
     }
diff --git a/app/common/dao/user/ExchangeQuotaRecordDao.php b/app/common/dao/user/ExchangeQuotaRecordDao.php
index 39ab3e6..2b89960 100644
--- a/app/common/dao/user/ExchangeQuotaRecordDao.php
+++ b/app/common/dao/user/ExchangeQuotaRecordDao.php
@@ -48,6 +48,9 @@ class ExchangeQuotaRecordDao extends BaseDao{
                 'user'     => function($query){
                     $query->field('uid,nickname,avatar')->bind(['nickname','avatar']);
                 },
+                'mer'      => function($query){
+                    $query->field('mer_id,mer_name,mer_avatar');
+                },
             ])
             ->order('create_time DESC,id DESC');
     }
diff --git a/app/common/model/user/ExchangeQuota.php b/app/common/model/user/ExchangeQuota.php
index 1d489d8..52171b0 100644
--- a/app/common/model/user/ExchangeQuota.php
+++ b/app/common/model/user/ExchangeQuota.php
@@ -7,6 +7,7 @@ namespace app\common\model\user;
 
 
 use app\common\model\BaseModel;
+use app\common\model\system\merchant\Merchant;
 
 /**
  * Common: 酒卡额度总数
@@ -15,8 +16,7 @@ use app\common\model\BaseModel;
  * Class ExchangeQuota
  * @package app\common\model\user
  */
-class ExchangeQuota extends BaseModel
-{
+class ExchangeQuota extends BaseModel{
 
     /**
      * @return string
@@ -38,10 +38,12 @@ class ExchangeQuota extends BaseModel
         return 'exchange_quota';
     }
 
-    public function user()
-    {
+
+    public function user(){
         return $this->hasOne(User::class, 'uid', 'uid');
     }
-
+    public function mer(){
+        return $this->hasOne(Merchant::class, 'mer_id', 'mer_id');
+    }
 
 }
diff --git a/app/common/model/user/ExchangeQuotaRecord.php b/app/common/model/user/ExchangeQuotaRecord.php
index 0185681..d7f8e74 100644
--- a/app/common/model/user/ExchangeQuotaRecord.php
+++ b/app/common/model/user/ExchangeQuotaRecord.php
@@ -7,6 +7,7 @@ namespace app\common\model\user;
 
 
 use app\common\model\BaseModel;
+use app\common\model\system\merchant\Merchant;
 
 /**
  * Common: 酒卡额度变更记录
@@ -42,6 +43,8 @@ class ExchangeQuotaRecord extends BaseModel
     {
         return $this->hasOne(User::class, 'uid', 'uid');
     }
-
+    public function mer(){
+        return $this->hasOne(Merchant::class, 'mer_id', 'mer_id');
+    }
 
 }