Merge branch 'master-bug-vehiclemodel-hf' into dev

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

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

@@ -79,7 +79,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     @Cache(key = "user:member{1}")
     public UserMemberVo getMemberInfoByUserId(Integer userId) {
         return mapper.getInfoByUserId(userId);
-    }
+}
 
     //更新会员信息
     @Override
@@ -309,21 +309,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         mapper.deleteByExample(example);
     }
     private void setModifyData(UserMemberVo beforeMember, BaseUserMember aftereMember) throws Exception {
+
         log.info("保存修改会员记录={}",aftereMember);
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
         log.info("token信息={}",infoFromToken);
-
+        if (beforeMember==null) {
+             beforeMember = new UserMemberVo();
+        }
+        UserMemberVo finalBeforeMember = beforeMember;
         executorService.submit(()->{
             try {
-                AppUserVo qppUser = detailBiz.getUserInfoById(beforeMember.getUserId());
+                AppUserVo qppUser = detailBiz.getUserInfoById(aftereMember.getUserId());
                 BaseUserMemberExport baseUserMemberExport = BaseUserMemberExport
                         .builder()
                         .username(qppUser.getUsername())
-                        .beforeMemberLevel(beforeMember.getMemberLevel())
+                        .beforeMemberLevel(finalBeforeMember.getMemberLevel())
                         .memberLevel(aftereMember.getMemberLevel())
-                        .totalNumber(aftereMember.getTotalNumber() - beforeMember.getTotalNumber())
-                        .rentFreeDays(aftereMember.getRentFreeDays() - beforeMember.getRentFreeDays())
-                        .beforeDiscount(beforeMember.getDiscount())
+                        .totalNumber(aftereMember.getTotalNumber() - (finalBeforeMember.getTotalNumber()==null?0:finalBeforeMember.getTotalNumber()))
+                        .rentFreeDays(aftereMember.getRentFreeDays() - (finalBeforeMember.getRentFreeDays()==null?0:finalBeforeMember.getRentFreeDays()))
+                        .beforeDiscount(finalBeforeMember.getDiscount())
                         .discount(aftereMember.getDiscount())
                         .status(1)
                         .userId(beforeMember.getUserId())