wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
wuhui_zzw 2024-07-01 16:45:43 +08:00
parent 4c7d02f4b3
commit 0f5e731d0c
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/dao/user/ExchangeQuotaDao.php
View File

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

3
app/common/dao/user/ExchangeQuotaRecordDao.php
View File

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

12
app/common/model/user/ExchangeQuota.php
View File

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

5
app/common/model/user/ExchangeQuotaRecord.php
View File

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