123

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

@@ -62,6 +62,16 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
             baseUserMember.setBuyCount(1);
             insertSelective(baseUserMember);
         }else {
+            Integer discount=userMemberVo.getDiscount()==null?0:userMemberVo.getDiscount();
+            Integer discount1=baseUserMember.getDiscount()==null?0:baseUserMember.getDiscount();
+            if(discount<discount1){
+                baseUserMember.setDiscount(discount);
+            }
+            Integer level=userMemberVo.getMemberLevel()==null?0:userMemberVo.getMemberLevel();
+            Integer level1=baseUserMember.getMemberLevel()==null?0:baseUserMember.getMemberLevel();
+            if(level>level1){
+                baseUserMember.setMemberLevel(level);
+            }
             baseUserMember.setId(userMemberVo.getId());
             totalNumber+=userMemberVo.getTotalNumber()==null?0:userMemberVo.getTotalNumber();
             freeDays+=userMemberVo.getRentFreeDays()==null?0:userMemberVo.getRentFreeDays();