Merge branch 'master-modify-background-bug-hf' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -296,7 +296,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             detailBiz.updUuserInfoById(userVo1);
         }
         log.info("保存修改记录");
-        setModifyData(userMemberVo,baseUserMember,request);
+        setModifyData(userMemberVo,baseUserMember);
         log.info("保存成功");
 
     }
@@ -308,7 +308,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         criteria.andIn("userId", userIds);
         mapper.deleteByExample(example);
     }
-    private void setModifyData(UserMemberVo beforeMember, BaseUserMember aftereMember,HttpServletRequest request) throws Exception {
+    private void setModifyData(UserMemberVo beforeMember, BaseUserMember aftereMember) throws Exception {
         log.info("保存修改会员记录={}",aftereMember);
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
         executorService.submit(()->{
@@ -318,6 +318,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                         .builder()
                         .username(qppUser.getUsername())
                         .beforeMemberLevel(beforeMember.getMemberLevel())
+                        .memberLevel(aftereMember.getMemberLevel())
                         .totalNumber(aftereMember.getTotalNumber() - beforeMember.getTotalNumber())
                         .rentFreeDays(aftereMember.getRentFreeDays() - beforeMember.getRentFreeDays())
                         .beforeDiscount(beforeMember.getDiscount())