Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/admin/service/member/MemberService.php

@@ -102,7 +102,7 @@ class MemberService
                     $query->where('member_is_referrer', 'Y');
                 }
             })
-            ->select('member_id', 'member_is_vip', 'member_is_owner', 'member_is_partner', 'member_is_referrer', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
+            ->select('member_id', 'member_is_vip', 'member_is_owner','join_invite_member_id', 'member_is_partner', 'member_is_referrer', '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_info.member_info_city', 'member_info.member_info_address', 'member_info.member_info_gender', 'member_info.member_info_birthday',
                 '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'
@@ -118,6 +118,10 @@ class MemberService
         foreach ($rows as &$row) {
             $row['coupon_count'] = CouponDetail::where('join_coupon_detail_member_id', $row['member_id'])->count();
             $row['member_mobile'] = substr($row['member_mobile'], 0, 3) . '****' . substr($row['member_mobile'], 7);
+            // 推荐人
+            if (!empty($row['join_invite_member_id'])){
+                $row['referrer_name'] = MemberService::getMemberNameByMemberId($row['join_invite_member_id']);
+            }
             $row['info'] = [
                 'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'], -4, 4) . '会员',
                 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : '',
@@ -250,6 +254,8 @@ class MemberService
         $level = $request->get('level', '');
         $isAuth = $request->get('is_auth', '');
         $addtime = $request->get('member_addtimes', []);
+        $isPartner = $request->get('member_is_partner','');
+        $isReferrer = $request->get('member_is_referrer','');
 
         $rows = Member::with('account')
             ->where('member_is_owner', 'N')
@@ -265,6 +271,10 @@ class MemberService
                 $query->where('member_cert.member_cert_name', 'like', '%' . $name . '%');
             })->when($mobile != '', function ($query) use ($mobile) {
                 $query->where('member.member_mobile', 'like', '%' . $mobile . '%');
+            })->when($isPartner != '', function ($query) use ($isPartner) {
+                $query->where('member.member_is_partner', $isPartner);
+            })->when($isReferrer != '', function ($query) use ($isReferrer) {
+                $query->where('member.member_is_referrer', $isReferrer);
             })->when($level != '', function ($query) use ($level) {
                 if ($level == 'other') {
                     $query->where('member.join_member_role_id', NULL)->orWhere('member.join_member_role_id', '');
@@ -281,7 +291,7 @@ class MemberService
                 $addtime[0] = strtotime($addtime[0]);
                 $addtime[1] = strtotime($addtime[1]);
                 $query->whereBetween('member.member_addtimes', $addtime);
-            })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
+            })->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',
@@ -291,7 +301,10 @@ class MemberService
             ->toArray();
 
         $exportData = [];
-        foreach ($rows as $row) {
+        foreach ($rows as $row) {// 推荐人
+            if (!empty($row['join_invite_member_id'])){
+                $row['referrer_name'] = MemberService::getMemberNameByMemberId($row['join_invite_member_id']);
+            }
             $row['info'] = [
                 'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'], -4, 4) . '会员',
                 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : '',
@@ -350,7 +363,7 @@ class MemberService
                 'is_auth' => $row['is_auth'],
                 'level' => $row['member_role_name'] ?? '普通会员',
                 'member_addtimes' => $row['member_addtimes'],
-                'member_info_referee' => $row['info']['member_info_referee'] ?? '',
+                'referrer_name' => $row['referrer_name'] ?? '',
                 'member_info_business' => $row['info']['member_info_business'] ?? '',
                 'member_info_service' => $row['info']['member_info_service'] ?? '',
             ];

app/admin/service/order/OrderService.php

@@ -935,6 +935,7 @@ class OrderService
         $orders = Order::where('order_groupby', $params['orderGroupId'])->get()->toArray();
         if (!empty($orders)) {
             foreach ($orders as $orderItem) {
+                $params['member_id'] = $orderItem['join_order_member_id'];
                 $params['orderId'] = $orderItem['order_id'];
                 Event::dispatch('commission.order', $params);
             }

app/event/order/CommissionEvent.php

@@ -92,10 +92,11 @@ class CommissionEvent
             _syslog("提成", "计算提成成功");
         } catch (BusinessException $e) {
             Db::rollBack();
+            Log::error("计算消费提成异常",['msg'=>$e->getMessage()]);
             _syslog("提成", "计算提成失败:" . $e->getMessage());
         } catch (\Exception $e) {
-            dump($e->getMessage());
             Db::rollBack();
+            Log::error("计算消费提成异常",['msg'=>$e->getMessage()]);
             _syslog("提成", "计算提成失败");
         }
     }