ogb912/niucloud-saas
1
0
Fork 0
mirror of https://gitee.com/niucloud-team/niucloud synced 2026-08-14 17:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update niucloud

Browse Source
This commit is contained in:
全栈小学生
2024-06-15 15:36:09 +08:00
parent 7e5030ae3b
commit a4ed423b4c
160 changed files with 5169 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
niucloud/app/model/diy/DiyRoute.php
View File

@@ -56,7 +56,7 @@ class DiyRoute extends BaseModel
public function searchTitleAttr($query, $value, $data)
{
if ($value) {
$query->where("title", 'like','%'.$value.'%');
$query->where("title", 'like', '%' . $value . '%');
}
}

26
niucloud/app/model/member/MemberAccountLog.php
View File

@@ -125,6 +125,32 @@ class MemberAccountLog extends BaseModel
}
}
/**
* 金额大于
* @param $query
* @param $value
* @param $data
*/
public function searchAccountDataGtAttr($query, $value, $data)
{
if ($value !== '' && $value !== null) {
$query->where('account_data', '>',$value);
}
}
/**
* 金额小于
* @param $query
* @param $value
* @param $data
*/
public function searchAccountDataLtAttr($query, $value, $data)
{
if ($value !== '' && $value !== null) {
$query->where('account_data', '<',$value);
}
}
/**
* 会员搜索(用于关联表查询)
* @param $query

11
niucloud/app/model/member/MemberAddress.php
View File

@@ -33,15 +33,4 @@ class MemberAddress extends BaseModel
*/
protected $name = 'member_address';
/**
* 搜索器:会员收货地址地址类型 1 普通地址 2 定位地址
* @param $value
* @param $data
*/
public function searchTypeAttr($query, $value, $data)
{
if ($value) {
$query->where("type", $value);
}
}
}

2
niucloud/app/model/member/MemberCashOut.php
View File

@@ -145,7 +145,7 @@ class MemberCashOut extends BaseModel
public function searchStatusAttr($query, $value, $data)
{
if ($value) {
$query->where('status', $value);
$query->where('member_cash_out.status', $value);
}
}

3
niucloud/app/model/member/MemberLevel.php
View File

@@ -35,7 +35,8 @@ class MemberLevel extends BaseModel
protected $type = [
'level_benefits' => 'json',
'level_gifts' => 'json'
'level_gifts' => 'json',
'style' => 'json'
];
/**

2
niucloud/app/model/site/SiteGroup.php
View File

@@ -64,7 +64,7 @@ class SiteGroup extends BaseModel
*/
public function getAddonNameAttr($value, $data)
{
if (empty($data['app']))
if (empty($data['addon']))
return [];
return (new Addon())->where([['key', 'in', $data['addon']]])->column('title');
}

19
niucloud/app/model/sys/SysUser.php
View File

@@ -139,5 +139,22 @@ class SysUser extends BaseModel
}
}
/**
* 创建时间搜索器
* @param $query
* @param $value
* @param $data
*/
public function searchLastTimeAttr($query, $value, $data)
{
$start_time = empty($value[0]) ? 0 : strtotime($value[0]);
$end_time = empty($value[1]) ? 0 : strtotime($value[1]);
if ($start_time > 0 && $end_time > 0) {
$query->whereBetweenTime('sys_user.last_time', $start_time, $end_time);
} else if ($start_time > 0 && $end_time == 0) {
$query->where([['sys_user.last_time', '>=', $start_time]]);
} else if ($start_time == 0 && $end_time > 0) {
$query->where([['sys_user.last_time', '<=', $end_time]]);
}
}
}

4
niucloud/app/model/sys/SysUserRole.php
View File

@@ -47,7 +47,7 @@ class SysUserRole extends BaseModel
*/
public function userinfo()
{
return $this->hasOne(SysUser::class, 'uid', 'uid')->joinType('inner')
return $this->hasOne(SysUser::class, 'uid', 'uid')->joinType('right')
->withField('uid,username,head_img,real_name,last_ip,last_time,login_count,create_time')
->bind(['username', 'head_img', 'real_name', 'last_ip', 'last_time', 'login_count']);
}
@@ -60,7 +60,7 @@ class SysUserRole extends BaseModel
{
return $this->hasOne(Site::class, 'site_id', 'site_id')->joinType('inner')
->withField('site_id, site_name, app_type, status, expire_time')
->bind(['site_name', 'app_type', 'status', 'expire_time', 'status_name', 'site_status_name'])->append(['status_name', 'site_status_name']);
->bind(['site_name', 'app_type', 'expire_time', 'status_name', 'site_status_name'])->append(['status_name', 'site_status_name']);
}
/**

38
niucloud/app/model/sys/UserCreateSiteLimit.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的saas管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\model\sys;
use app\model\site\SiteGroup;
use core\base\BaseModel;
/**
* @package app\model\sys
*/
class UserCreateSiteLimit extends BaseModel
{
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'user_create_site_limit';
public function siteGroup() {
return $this->hasOne(SiteGroup::class, 'group_id', 'group_id')->append(['app_name', 'addon_name']);
}
}

51
niucloud/app/model/sys/WxOplatfromWeappVersion.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的saas管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\model\sys;
use app\dict\sys\CloudDict;
use app\model\site\SiteGroup;
use core\base\BaseModel;
/**
* @package app\model\sys
*/
class WxOplatfromWeappVersion extends BaseModel
{
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'wx_oplatfrom_weapp_version';
public function siteGroup() {
return $this->hasOne(SiteGroup::class, 'group_id', 'site_group_id')->bind(['site_group_name' => 'group_name']);
}
/**
* 状态字段转化
* @param $value
* @param $data
* @return mixed
*/
public function getStatusNameAttr($value, $data)
{
if (!isset($data['status']) || empty($data['status'])) return '';
return CloudDict::getAppletUploadSatus($data['status']);
}
}

13
niucloud/app/model/verify/Verify.php
View File

@@ -72,6 +72,19 @@ class Verify extends BaseModel
$query->where('relate_tag', '=', $value);
}
}
/**
* 核销员
* @param $query
* @param $value
* @param $data
* @return void
*/
public function searchVerifierMemberIdAttr($query, $value, $data)
{
if ($value) {
$query->where('verifier_member_id', '=', $value);
}
}
/**
* 核销类型搜索