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

niucloud

Browse Source
This commit is contained in:
全栈小学生
2023-06-02 19:11:52 +08:00
parent c59d011d1e
commit 05a8c49ce6
71 changed files with 403 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
niucloud/app/model/addon/Addon.php
View File

@@ -22,7 +22,7 @@ use core\base\BaseModel;
class Addon extends BaseModel
{
protected $type = [
'install_time' => 'timestamp',
'install_time' => 'timestamp',
];
/**
* 数据表主键
@@ -47,6 +47,7 @@ class Addon extends BaseModel
{
return AddonDict::getStatus()[ $data[ 'status' ] ?? '' ] ?? '';
}
/**
* 插件名称搜索器
* @param $value
@@ -55,11 +56,8 @@ class Addon extends BaseModel
public function searchTitleAttr($query, $value, $data)
{
if ($value) {
$query->whereLike('title', '%'.$value.'%');
$query->whereLike('title', '%' . $value . '%');
}
}
}

16
niucloud/app/model/member/Member.php
View File

@@ -193,6 +193,22 @@ class Member extends BaseModel
* @param $value
*/
public function searchCreateTimeAttr(Query $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('create_time', $start_time, $end_time);
} else if ($start_time > 0 && $end_time == 0) {
$query->where([ [ 'create_time', '>=', $start_time ] ]);
} else if ($start_time == 0 && $end_time > 0) {
$query->where([ [ 'create_time', '<=', $end_time ] ]);
}
}
/**
* 创建时间搜索器
* @param $value
*/
public function searchJoinCreateTimeAttr(Query $query, $value, $data)
{
$start_time = empty($value[ 0 ]) ? 0 : strtotime($value[ 0 ]);
$end_time = empty($value[ 1 ]) ? 0 : strtotime($value[ 1 ]);

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

@@ -64,7 +64,7 @@ class MemberAccountLog extends BaseModel
*/
public function member()
{
return $this->hasOne( Member::class, 'member_id', 'member_id')->withField('member_id, member_no, username, mobile, nickname, headimg')->joinType('left');
return $this->hasOne( Member::class, 'member_id', 'member_id')->withField('member_id, member_no, username, mobile, nickname, headimg')->joinType('inner');
}
/**
@@ -120,6 +120,18 @@ class MemberAccountLog extends BaseModel
}
}
/**
* 会员搜索(用于关联表查询)
* @param $value
* @param $data
*/
public function searchJoinMemberIdAttr($query, $value, $data)
{
if ($value) {
$query->where('member_account_log.member_id', $value);
}
}
/**
* 类型搜索
* @param $value
@@ -147,6 +159,23 @@ class MemberAccountLog extends BaseModel
* @param $value
*/
public function searchCreateTimeAttr($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('create_time', $start_time, $end_time);
}else if($start_time > 0 && $end_time == 0){
$query->where([['create_time', '>=', $start_time]]);
}else if($start_time == 0 && $end_time > 0){
$query->where([['create_time', '<=', $end_time]]);
}
}
/**
* 创建关联表时间搜索器
* @param $value
*/
public function searchJoinCreateTimeAttr($query, $value, $data)
{
$start_time = empty($value[0]) ? 0 : strtotime($value[0]) ;
$end_time = empty($value[1]) ? 0 : strtotime($value[1]) ;

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

@@ -172,6 +172,23 @@ class MemberCashOut extends BaseModel
}
}
/**
* 创建时间搜索器
* @param $value
*/
public function searchJoinCreateTimeAttr($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('member_cash_out.create_time', $start_time, $end_time);
}else if($start_time > 0 && $end_time == 0){
$query->where([['member_cash_out.create_time', '>=', $start_time]]);
}else if($start_time == 0 && $end_time > 0){
$query->where([['member_cash_out.create_time', '<=', $end_time]]);
}
}
/**
* 审核时间搜索器
* @param $value

57
niucloud/app/model/order/OrderItemRefund.php
View File

@@ -11,7 +11,6 @@
namespace app\model\order;
use app\dict\pay\PayRefundDict;
use app\model\member\Member;
use app\model\pay\Refund;
use core\base\BaseModel;
@@ -100,6 +99,19 @@ class OrderItemRefund extends BaseModel
* @param $data
*/
public function searchOrderNoAttr($query, $value, $data)
{
if ($value) {
$query->where('order_no', '=', $value);
}
}
/**
* 订单号搜索(用于关联)
* @param $query
* @param $value
* @param $data
*/
public function searchJoinOrderNoAttr($query, $value, $data)
{
if ($value) {
$query->where('order_item_refund.order_no', '=', $value);
@@ -113,6 +125,19 @@ class OrderItemRefund extends BaseModel
* @param $data
*/
public function searchMemberIdAttr($query, $value, $data)
{
if ($value) {
$query->where('member_id', '=', $value);
}
}
/**
* 会员id搜索
* @param $query
* @param $value
* @param $data
*/
public function searchJoinMemberIdAttr($query, $value, $data)
{
if ($value) {
$query->where('order_item_refund.member_id', '=', $value);
@@ -126,6 +151,19 @@ class OrderItemRefund extends BaseModel
* @param $data
*/
public function searchStatusAttr($query, $value, $data)
{
if ($value != '') {
$query->where('status', '=', $value);
}
}
/**
* 退款状态
* @param $query
* @param $value
* @param $data
*/
public function searchJoinStatusAttr($query, $value, $data)
{
if ($value != '') {
$query->where('order_item_refund.status', '=', $value);
@@ -137,6 +175,23 @@ class OrderItemRefund extends BaseModel
* @param $value
*/
public function searchCreateTimeAttr($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('create_time', $start_time, $end_time);
}else if($start_time > 0 && $end_time == 0){
$query->where([['create_time', '>=', $start_time]]);
}else if($start_time == 0 && $end_time > 0){
$query->where([['create_time', '<=', $end_time]]);
}
}
/**
* 创建时间搜索器
* @param $value
*/
public function searchJoinCreateTimeAttr($query, $value, $data)
{
$start_time = empty($value[0]) ? 0 : strtotime($value[0]) ;
$end_time = empty($value[1]) ? 0 : strtotime($value[1]) ;

3
niucloud/app/model/pay/Refund.php
View File

@@ -11,9 +11,6 @@
namespace app\model\pay;
use app\dict\order\OrderTypeDict;
use app\dict\pay\PayDict;
use app\dict\pay\PayRefundDict;
use app\dict\pay\RefundDict;
use core\base\BaseModel;