Merge branch 'master' into dev

app/admin/service/notify/RechargeService.php

@@ -117,13 +117,13 @@ class RechargeService
                 $memberRoleConfigJson['next'][] = ['member_role_begintime' => date('Y-m-d H:i:s'), 'member_role_id' => $role->member_role_id];
             }
             $memberRoleConfigJson['deadline_datetime'] = date('Y-m-d 23:59:59',strtotime($memberRoleBegintime.' +364 days'));
-
-            Member::where('member_id', $memberId)->update([
-                'join_member_role_id' => $memberRoleId,
-                'member_role_begintime' => $memberRoleBegintime,
-                'member_role_config_json' => json_encode($memberRoleConfigJson)
-            ]);
-
+            if(!empty($memberRoleId)){
+                Member::where('member_id', $memberId)->update([
+                    'join_member_role_id' => $memberRoleId,
+                    'member_role_begintime' => $memberRoleBegintime,
+                    'member_role_config_json' => json_encode($memberRoleConfigJson)
+                ]);
+            }
         } catch (\Exception $e) {
             Log::error('计算等级异常：' . $e->getMessage());
             throw new BusinessException("计算等级异常");