修改后台设置会员信息

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -66,6 +66,8 @@ public class UserMemberDTO  {
 	@ApiModelProperty(value = "有效期;0代表永久")
 	private Long validTime;
 
+
+
 	@Column(name = "member_name")
 	@ApiModelProperty("会员名")
     private String memberName;

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

@@ -73,7 +73,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             return;
         }
         Integer userId = userMemberDTO.getUserId();
+
         UserMemberVo userMemberVo = getMemberInfoByUserId(userId);
+
         BaseUserMember baseUserMember = new BaseUserMember();
         BeanUtils.copyProperties(baseUserMember, userMemberDTO);
         Integer freeDays = baseUserMember.getRentFreeDays();
@@ -106,6 +108,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             baseUserMember.setBuyCount(userMemberVo.getBuyCount() + buyCount);
             baseUserMember.setTotalNumber(totalNumber);
             baseUserMember.setRentFreeDays(freeDays);
+
             getMyBiz().updateSelectiveById(baseUserMember);
         }
         AppUserVo userVo = detailBiz.getUserInfoById(userId);
@@ -212,42 +215,46 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     /**
      * 设置用户会员
      *
-     * @param baseUserMemberVO
+     * @param userMemberDTO
      */
-    @Transactional(rollbackFor = Exception.class)
-    public void UpdateUserMember(BaseUserMemberVO baseUserMemberVO) throws InvocationTargetException, IllegalAccessException {
-
-        Example exa = Example.builder(BaseUserMember.class).where(
-                WeekendSqls.<BaseUserMember>custom()
-                        .andEqualTo(BaseUserMember::getUserId, baseUserMemberVO.getUserId())
-        ).build();
-        List<BaseUserMember> baseUserMembers = mapper.selectByExample(exa);
-        BaseUserMember baseUserMember = new BaseUserMember();
-        BeanUtilsBean.getInstance().copyProperties(baseUserMember, baseUserMemberVO);
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void UpdateUserMember(UserMemberDTO userMemberDTO) throws InvocationTargetException, IllegalAccessException {
 
-        if (CollectionUtils.isEmpty(baseUserMembers)) {
-            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null||baseUserMember.getValidTime()<0) {
-                throw new BaseException("设置无效!无会员等级、会员有效期或会员有效期为负数!");
-            }
-            baseUserMember.setCrtTime(System.currentTimeMillis());
-            baseUserMember.setIsDel(0);
-            baseUserMember.setPayCount(0);
-            baseUserMember.setCardLeave(1);
-            baseUserMember.setRecentRecharge(System.currentTimeMillis());
-            Integer buyCount = baseUserMember.getBuyCount() == null ? 0 : baseUserMember.getBuyCount();
-            baseUserMember.setBuyCount(buyCount + 1);
+        Integer userId = userMemberDTO.getUserId();
+        BaseUserMember baseUserMember = new BaseUserMember();
+        BeanUtils.copyProperties(baseUserMember, userMemberDTO);
+        Integer freeDays = baseUserMember.getRentFreeDays() == null ? 0 : baseUserMember.getRentFreeDays();
+        Integer totalNumber = baseUserMember.getTotalNumber() == null ? 0 : baseUserMember.getTotalNumber();
+        if (totalNumber < freeDays) {
+            freeDays = totalNumber;
+        }
+        Integer buyCount = userMemberDTO.getBuyCount() == null ? 1:userMemberDTO.getBuyCount() ;
+        UserMemberVo userMemberVo = getMemberInfoByUserId(userMemberDTO.getUserId());
+        if (userMemberVo == null) {
+            baseUserMember.setRentFreeDays(freeDays);
+            baseUserMember.setBuyCount(buyCount);
             insertSelective(baseUserMember);
-            return;
-        } else if (baseUserMembers.size() == 1) {
-            baseUserMember.setUpdTime(System.currentTimeMillis());
-            baseUserMember.setBuyCount(baseUserMembers.get(0).getBuyCount() + 1);
-            baseUserMember.setId(baseUserMembers.get(0).getId());
-            mapper.updateByPrimaryKeySelective(baseUserMember);
         } else {
-            throw new BaseException("错误!该账号有多条会员信息!");
+            baseUserMember.setId(userMemberVo.getId());
+            Integer number = userMemberVo.getTotalNumber() == null ? 0 : userMemberVo.getTotalNumber();
+            Integer days = userMemberVo.getRentFreeDays() == null ? 0 : userMemberVo.getRentFreeDays();
+            baseUserMember.setBuyCount(userMemberVo.getBuyCount() + buyCount);
+            number=(totalNumber-number)+number;
+            days=(freeDays-days)+days;
+            baseUserMember.setTotalNumber(number);
+            baseUserMember.setRentFreeDays(days);
+            getMyBiz().updateSelectiveById(baseUserMember);
+        }
+        AppUserVo userVo = detailBiz.getUserInfoById(userId);
+        if (userVo != null && (userVo.getIsMember() == null || userVo.getIsMember() == 0)) {
+            AppUserVo userVo1 = new AppUserVo();
+            userVo1.setId(userVo.getId());
+            userVo1.setUserid(userId);
+            userVo1.setIsMember(1);
+            detailBiz.updUuserInfoById(userVo1);
         }
-
 
     }
 
+
 }
\ No newline at end of file

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

@@ -53,7 +53,12 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
     @PutMapping("/setUserMember")
     public ObjectRestResponse UpdateUserMember(@RequestBody UserMemberDTO userMemberDTO)
             throws Exception {
-        baseBiz.updUserMemberByUserId(userMemberDTO);
+        if (userMemberDTO==null||userMemberDTO.getRentFreeDays()<0||userMemberDTO.getTotalNumber()<0) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+
+        baseBiz.UpdateUserMember(userMemberDTO);
         return ObjectRestResponse.succ();
     }
 }