|
|
@@ -795,11 +795,12 @@ class User extends BaseModel
|
|
|
$integral_count = UserBill::where('uid', $uid)->where('category', 'integral')->where('type', 'in', 'deduction,system_add')->count();
|
|
|
$sign_count = UserBill::where('type', 'sign')->where('uid', $uid)->where('category', 'integral')->count();
|
|
|
$balanceChang_count = UserBill::where('category', 'now_money')->where('uid', $uid)
|
|
|
- ->where('type', 'in', 'system_add,pay_product,extract,pay_product_refund,system_sub')
|
|
|
+// ->where('type', 'in', 'system_add,pay_product,extract,pay_product_refund,system_sub')
|
|
|
->count();
|
|
|
+ $consumeChang_count = UserBill::where('category', 'consumer')->where('uid', $uid)->count();
|
|
|
$coupon_count = StoreCouponUser::where('uid', $uid)->count();
|
|
|
$spread_count = self::where('spread_uid', $uid)->count();
|
|
|
- return compact('order_count', 'integral_count', 'sign_count', 'balanceChang_count', 'coupon_count', 'spread_count');
|
|
|
+ return compact('order_count', 'integral_count', 'consumeChang_count', 'sign_count', 'balanceChang_count', 'coupon_count', 'spread_count');
|
|
|
}
|
|
|
|
|
|
/*
|
Kirin