Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMember.java

@@ -75,6 +75,13 @@ public class BaseUserMember implements Serializable {
     @Column(name = "rent_free_days")
 	@ApiModelProperty(value = "剩余天数")
     private Integer rentFreeDays;
+
+
+	//折扣
+	@Column(name = "discount")
+	@ApiModelProperty(value = "折扣")
+	private Integer discount;
+
 	
 	    /**
      *  有效期;0代表永久

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

@@ -27,6 +27,7 @@ public class AppUserDTO {
 	private Integer certificationStatus;
 	private Integer rentFreeDays;
 	private Integer totalNumber;
+	private Integer discount;
 	private Integer memberLevel;
 	private Integer memberNo;
 	private Long cardLeave;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/UserMemberVo.java

@@ -62,6 +62,10 @@ public class UserMemberVo {
      */
 	@ApiModelProperty(value = "剩余天数")
     private Integer rentFreeDays;
+
+	//折扣
+	@ApiModelProperty(value = "折扣")
+	private Integer discount;
 	
 	    /**
      *  有效期;0代表永久

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

 package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
@@ -25,5 +26,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         return  mapper.getInfoByUserId(userId);
     }
 
+    //更新会员信息
+    @Override
+    @CacheClear(key = "user:member{1.userid}")
+    public  void  updateSelectiveById(BaseUserMember userMember){  super.updateSelectiveById(userMember);}
+
+
+    //用户会员信息更新
+    public  void  updUserMemberByUserId(){
+
+    }
+
+
 
 }
\ No newline at end of file