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-22 15:50:30 +08:00
commit bac0c6042d
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/admin/logic/user/UserLogic.php
View File

@ -190,12 +190,13 @@ class UserLogic extends BaseLogic
switch ($params['type']){
case 1:
//采购款明细
$categories = ['user_balance_recharge', 'user_order_purchase_pay'];
$categories = ['user_balance_recharge', 'user_order_purchase_pay','system_purchase_add'];
$query = CapitalFlow::where('uid', $params['id'])
->whereIn('category', $categories);
$count = $query->count();
$data = $query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
foreach ($data as &$value){
if($value['category'] == 'user_order_purchase_pay'){
@ -207,11 +208,13 @@ class UserLogic extends BaseLogic
break;
case 2:
//余额明细
$category = ['system_balance_add','user_order_balance_pay'];
$query = CapitalFlow::where('uid', $params['id'])
->where('category', 'user_order_balance_pay');
->whereIn('category', $category);
$count = $query->count();
$data = $query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
foreach ($data as &$value){
$value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id');
@ -224,6 +227,7 @@ class UserLogic extends BaseLogic
$count = $query->count();
$data =$query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
break;
case 4:
@ -232,6 +236,7 @@ class UserLogic extends BaseLogic
$count = $query->count();
$data = $query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
break;
default:

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

@ -205,15 +205,22 @@ class UserLogic extends BaseLogic
switch ($params['type']){
case 1:
//采购款明细
$categories = ['user_balance_recharge', 'user_order_purchase_pay'];
$categories = ['user_balance_recharge', 'user_order_purchase_pay','system_purchase_add'];
$query = CapitalFlow::where('uid', $uid)
->whereIn('category', $categories);
if($params['mark'] == 1){
$query->where('type','in');
}
if($params['mark'] == 2){
$query->where('type','out');
}
$count = $query->count();
$data = $query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
foreach ($data as &$value){
if($value['category'] == 'user_order_purchase_pay'){
if($value['category'] == 'user_order_purchase_pay' || $value['category'] == 'system_purchase_add' ){
$value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id');
}elseif($value['category'] == 'user_balance_recharge'){
$value['order_sn'] = UserRecharge::where('id',$value['link_id'])->value('order_id');
@ -222,11 +229,19 @@ class UserLogic extends BaseLogic
break;
case 2:
//余额明细
$category = ['system_balance_add','user_order_balance_pay'];
$query = CapitalFlow::where('uid', $uid)
->where('category', 'user_order_balance_pay');
->whereIn('category', $category);
if($params['mark'] == 1){
$query->where('type','in');
}
if($params['mark'] == 2){
$query->where('type','out');
}
$count = $query->count();
$data = $query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
foreach ($data as &$value){
$value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id');
@ -236,17 +251,31 @@ class UserLogic extends BaseLogic
case 3:
//礼品券明细
$query = UserSign::where(['uid'=>$uid]);
if($params['mark'] == 1){
$query->where('financial_pm',1);
}
if($params['mark'] == 2){
$query->where('financial_pm',0);
}
$count = $query->count();
$data =$query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
break;
case 4:
//返还金明细 -todo back
$query = VipFlow::with('store')->where(['user_id'=>$uid]);
if($params['mark'] == 1){
$query->where('status',1);
}
if($params['mark'] == 2){
$query->where('status',0);
}
$count = $query->count();
$data = $query
->page($params['page_no'],$params['page_size'])
->order('id','desc')
->select()->toArray();
break;
default: