mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-25 09:43:36 +08:00
commit 3c2f945514
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/logic/user/UserLogic.php
View File

@ -274,10 +274,10 @@ class UserLogic extends BaseLogic
//礼品券明细
$query = UserSign::where(['uid'=>$uid]);
if($params['mark'] == 1){
$query->where('financial_pm',1);
$query->where('financial_pm',0);
}
if($params['mark'] == 2){
$query->where('financial_pm',0);
$query->where('financial_pm',1);
}
$count = $query->count();
$data =$query
@ -289,10 +289,10 @@ class UserLogic extends BaseLogic
//返还金明细 -todo back
$query = VipFlow::with('store')->where(['user_id'=>$uid]);
if($params['mark'] == 1){
$query->where('status',1);
$query->where('status',0);
}
if($params['mark'] == 2){
$query->where('status',0);
$query->where('status',1);
}
$count = $query->count();
$data = $query