|
|
@@ -131,7 +131,7 @@ class MemberService
|
|
|
->toArray();
|
|
|
|
|
|
foreach ($rows as &$row) {
|
|
|
- $row['coupon_count'] = CouponDetail::where('join_coupon_detail_member_id', $row['member_id'])->count();
|
|
|
+ $row['coupon_count'] = CouponDetail::where('join_coupon_detail_member_id', $row['member_id'])->whereIn('coupon_detail_status',['ACTIVED','WAITING'])->count();
|
|
|
$row['member_mobile'] = substr($row['member_mobile'], 0, 3) . '****' . substr($row['member_mobile'], 7);
|
|
|
// 推荐人
|
|
|
if (!empty($row['join_invite_member_id'])) {
|
|
|
@@ -338,7 +338,7 @@ class MemberService
|
|
|
})->select('member_id', 'join_invite_member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
|
|
|
'member_info.member_info_nickname', 'member_info.member_info_headimg', 'member_info.member_info_referee', 'member_info.member_info_business', 'member_info.member_info_service',
|
|
|
'member_role.member_role_id', 'member_role.member_role_name',
|
|
|
- 'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation',
|
|
|
+ 'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation'
|
|
|
// 'member_account.member_account_surplus'
|
|
|
)->orderBy('member_addtimes', 'DESC')
|
|
|
->get()
|
gorden