Merge branch 'master-modify-background-bug-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

@@ -64,6 +64,8 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     @Autowired
     private BaseUserMemberExportBiz baseUserMemberExportBiz;
 
+    @Autowired
+    private HttpServletRequest request;
 //    @Autowired
 //    private TaskExecutor taskExecutor;
 //
@@ -240,7 +242,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
      * @param userMemberDTO
      */
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void UpdateUserMember(UserMemberDTO userMemberDTO,HttpServletRequest request) throws Exception {
+    public void UpdateUserMember(UserMemberDTO userMemberDTO) throws Exception {
 
         Integer userId = userMemberDTO.getUserId();
         BaseUserMember baseUserMember = new BaseUserMember();
@@ -270,9 +272,6 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         Integer buyCount = userMemberDTO.getBuyCount() == null ? 1 : userMemberDTO.getBuyCount();
         UserMemberVo userMemberVo = getMemberInfoByUserId(userMemberDTO.getUserId());
         //保存修改记录
-        log.info("保存修改记录");
-        setModifyData(userMemberVo,userMemberDTO,request);
-        log.info("保存成功");
         if (userMemberVo == null) {
             baseUserMember.setRentFreeDays(freeDays);
             baseUserMember.setBuyCount(buyCount);
@@ -296,6 +295,10 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             userVo1.setIsMember(1);
             detailBiz.updUuserInfoById(userVo1);
         }
+        log.info("保存修改记录");
+        setModifyData(userMemberVo,baseUserMember,request);
+        log.info("保存成功");
+
     }
 
 
@@ -305,7 +308,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         criteria.andIn("userId", userIds);
         mapper.deleteByExample(example);
     }
-    private void setModifyData(UserMemberVo beforeMember, UserMemberDTO aftereMember,HttpServletRequest request) throws Exception {
+    private void setModifyData(UserMemberVo beforeMember, BaseUserMember aftereMember,HttpServletRequest request) throws Exception {
         log.info("保存修改会员记录={}",aftereMember);
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
         executorService.submit(()->{

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseUserMemberController.java

@@ -101,7 +101,7 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
             return ObjectRestResponse.createDefaultFail();
         }
 
-        baseBiz.UpdateUserMember(userMemberDTO,request);
+        baseBiz.UpdateUserMember(userMemberDTO);
         return ObjectRestResponse.succ();
     }
 }