增加：惠民积分增加绑定商户信息

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');
     }

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');
     }

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');
+    }
 
 }

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');
+    }
 
 }