我的佣金

app/admin/controller/member/MemberController.php

@@ -509,7 +509,7 @@ class MemberController
         $memberId = $request->get('member_id', '');
         $coupons = CouponDetail::leftJoin('coupon', 'coupon.coupon_id', '=', 'coupon_detail.join_detail_coupon_id')
             ->where('join_coupon_detail_member_id', $memberId)
-            ->select('coupon.coupon_name', 'coupon.coupon_classify')
+            ->select('coupon.coupon_name', 'coupon.coupon_classify','coupon.coupon_value')
             ->get()
             ->toArray();
         $data = ['manjian' => 0, 'diyong' => 0, 'zhekou' => 0, 'lijian' => 0, 'zengpin' => 0, 'fuli' => 0, 'nianka' => 0, 'jika' => 0, 'yueka' => 0];

app/admin/service/member/MemberService.php

@@ -747,6 +747,14 @@ class MemberService
         $rows = $rows->forPage($page, $pageSize)
             ->get()
             ->toArray();
+        foreach ($rows as $row){
+            if (!empty($row['member_account_list_json'])){
+                $memberAccountListJson = json_decode($row['member_account_list_json'],true);
+                if ($memberAccountListJson['master_member_id']){
+                    $row['master_member_name'] = MemberService::getMemberNameByMemberId($row['member_account_list_json']);
+                }
+            }
+        }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
     }
@@ -1137,6 +1145,10 @@ class MemberService
     {
         Db::beginTransaction();
         try {
+            // 排重
+            if (Member::where('member_mobile',$params['mobile'])->where('member_status','ACTIVED')->exists()){
+                throw new BusinessException("会员已存在");
+            }
             $memberId = self::generateMemberId();
             // 先写主表，要ID
             $memberData = [