Browse Source

财务统计

gorden 9 months ago
parent
commit
1d07b5ae8a

+ 0 - 1
app/admin/controller/member/WriteOffController.php

@@ -65,7 +65,6 @@ class WriteOffController extends Curd
                 $query->whereJsonContains('member_quota.member_quota_used_json->charge->charge_premises',$premises);
             })
             ->where('member_quota_status', 'USED')
-//            ->toSql();
             ->union($appointmentList);
             $total = $quotaList->count('*');
 

+ 1 - 1
app/admin/service/member/MemberService.php

@@ -301,7 +301,7 @@ class MemberService
             if(!empty($item['join_pay_order_id'])){
                 $orderIds = Order::where('order_groupby', $item['join_pay_order_id'])->pluck('order_id');
                 $goodsIds = OrderSheet::whereIn('join_sheet_order_id', $orderIds)->pluck('join_sheet_goods_id');
-                $categoryIds = Goods::whereIn('goods_id', $goodsIds)->pluck('join_goods_category_id');
+                $categoryIds = Goods::whereIn('goods_id', $goodsIds)->pluck('join_goods_category_id')->toArray();
             }