修改设置会员

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.task.TaskExecutor;
@@ -220,14 +221,11 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                 WeekendSqls.<BaseUserMember>custom()
                         .andEqualTo(BaseUserMember::getUserId, baseUserMemberVO.getUserId())
         ).build();
-
         List<BaseUserMember> baseUserMembers = mapper.selectByExample(exa);
-
         BaseUserMember baseUserMember = new BaseUserMember();
         BeanUtilsBean.getInstance().copyProperties(baseUserMember, baseUserMemberVO);
 
-        if (baseUserMembers == null || baseUserMembers.size() == 0) {
-
+        if (CollectionUtils.isEmpty(baseUserMembers)) {
             if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null) return;
             baseUserMember.setCrtTime(System.currentTimeMillis());
             baseUserMember.setIsDel(0);
@@ -240,17 +238,10 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             return;
 
         } else if (baseUserMembers.size() == 1) {
-            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null) {
-                baseUserMember.setTotalNumber(0);
-                baseUserMember.setRentFreeDays(0);
-            } else {
-            }
             baseUserMember.setUpdTime(System.currentTimeMillis());
             baseUserMember.setBuyCount(baseUserMembers.get(0).getBuyCount() + 1);
             baseUserMember.setId(baseUserMembers.get(0).getId());
             mapper.updateByPrimaryKeySelective(baseUserMember);
-
-
         } else {
             throw new BaseException("Member purchase repeat!");
         }

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

@@ -32,6 +32,19 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
 
 
 
+//    /**
+//     * 设置用户会员
+//     * @param userMemberDTO
+//     * @return
+//     */
+//    @PutMapping("/setUserMember")
+//    public ObjectRestResponse UpdateUserMember(@RequestBody BaseUserMemberVO baseUserMemberVO)
+//            throws Exception {
+//        baseBiz.UpdateUserMember(baseUserMemberVO);
+//        return ObjectRestResponse.succ();
+//    }
+
+
     /**
      * 设置用户会员
      * @param userMemberDTO