添加会员

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

+package com.github.wxiaoqi.security.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户会员表
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-18 19:38:56
+ */
+@Data
+@Table(name = "base_user_member")
+public class BaseUserMember implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  用户id
+     */
+    @Column(name = "user_id")
+	@ApiModelProperty(value = "用户id")
+    private Integer userId;
+	
+	    /**
+     *  会员编号
+     */
+    @Column(name = "member_no")
+	@ApiModelProperty(value = "会员编号")
+    private String memberNo;
+	
+	    /**
+     *  会员等级
+     */
+    @Column(name = "member_level")
+	@ApiModelProperty(value = "会员等级")
+    private Integer memberLevel;
+	
+	    /**
+     *  卡内余额
+     */
+    @Column(name = "card_leave")
+	@ApiModelProperty(value = "卡内余额")
+    private Integer cardLeave;
+	
+	    /**
+     *  0:未支付 1：绑定 2:解绑
+     */
+    @Column(name = "is_bind")
+	@ApiModelProperty(value = "0:未支付 1：绑定 2:解绑")
+    private Integer isBind;
+	
+	    /**
+     *  赠送总天数
+     */
+    @Column(name = "total_number")
+	@ApiModelProperty(value = "赠送总天数")
+    private Integer totalNumber;
+	
+	    /**
+     *  剩余天数
+     */
+    @Column(name = "s_number")
+	@ApiModelProperty(value = "剩余天数")
+    private Integer sNumber;
+	
+	    /**
+     *  有效期;0代表永久
+     */
+    @Column(name = "valid_time")
+	@ApiModelProperty(value = "有效期;0代表永久")
+    private Long validTime;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  是否删除；0-正常；1-删除
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

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

@@ -45,6 +45,11 @@ public class BaseUserMemberLevel implements Serializable {
     @Column(name = "describes")
 	@ApiModelProperty(value = "描述")
     private String describe;
+
+	//权益
+	@Column(name = "rights")
+	@ApiModelProperty(value = "权益")
+	private String rights;
 	
 	    //有效数；-1是永久有效
     @Column(name = "end_date")
@@ -65,6 +70,11 @@ public class BaseUserMemberLevel implements Serializable {
     @Column(name = "price")
 	@ApiModelProperty(value = "购买会员价格")
     private BigDecimal price;
+
+	//赠送免费天数
+	@Column(name = "number")
+	@ApiModelProperty(value = "赠送免费天数")
+	private Integer number;
 	
 
 }

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

@@ -4,6 +4,7 @@ package com.github.wxiaoqi.security.admin.feign;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,7 +41,7 @@ public interface UserFeign {
     public List<BaseUserMemberLevel> levels();
 
     @RequestMapping(value = "/public/app/userinfo-by-id")
-    public Map<Integer,Object> userDetailById(List<Integer> userids);
+    public Map<Integer, AppUserVo> userDetailById(List<Integer> userids);
 
 
 

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

@@ -19,9 +19,16 @@ public class AppUserDTO {
 	private String birthday;
 	private String personSign;
 	private String remark;
-	private Long createtime;
-	private Long updatetime;
-	private Integer isdel;
+	private String wxOpenid;
+	private String unionid;
+	private String openid;
+	private String status;
+	private String idNumber;
+	private Integer certificationStatus;
 	private Integer rentFreeDays;
+	private Integer memberLevel;
+	private Integer memberNo;
+	private Long cardLeave;
+	private Integer isBind;
 
 }

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

@@ -34,7 +34,6 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      * @param userid
      * @return
      */
-    @Cache(key="user{1}")
     public AppUserDetail getUserByUserid(Integer userid) {
         Example example = new Example(AppUserDetail.class);
         example.createCriteria().andEqualTo("userid", userid).andEqualTo("isdel", 0);
@@ -45,12 +44,20 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return null;
     }
 
-
+    /**
+     * 获取用户信息
+     * @param userid
+     * @return
+     */
+    @Cache(key="user{1}")
     public AppUserVo getUserInfoById(Integer userid){
         return mapper.getUserInfo(userid);
     }
 
-
+    /**
+     * 更新用户信息
+     * @param userVo
+     */
     @CacheClear(pre="user{1.userid}")
     public void updUuserInfoById(AppUserVo userVo){
         AppUserDetail entity =new  AppUserDetail();

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

+package com.github.wxiaoqi.security.admin.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 用户会员表
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-18 19:38:56
+ */
+@Service
+public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMember> {
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户会员表
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-18 19:38:56
+ */
+public interface BaseUserMemberMapper extends Mapper<BaseUserMember> {
+	
+}

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
 import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -19,6 +22,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import io.swagger.models.auth.In;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +43,10 @@ public class PublicController {
 
     @Autowired
     private UserBiz userBiz;
+
+    @Autowired
+    private AppUserLoginBiz userLoginBiz;
+
     @Autowired
     private AppUserDetailBiz detailBiz;
 
@@ -66,27 +74,30 @@ public class PublicController {
         if (username == null) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
+        AppUserDTO userDTO=new AppUserDTO();
         Integer userid=Integer.parseInt(username);
         AppUserDetail user = detailBiz.getUserByUserid(userid);
         if (user == null) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
+        BeanUtils.copyProperties(userDTO,user);
         return new ObjectRestResponse<AppUserDetail>().rel(true).data(user);
     }
 
     //批量获取用户信息
     @RequestMapping(value = "/app/userinfo-by-id", method = RequestMethod.GET)
     public @ResponseBody
-    Map<Integer,Object> userDetailById(List<Integer> userids) throws Exception {
-        Map<Integer,Object> map=new HashMap<>();
+    Map<Integer,AppUserVo> userDetailById(List<Integer> userids) throws Exception {
+        Map<Integer,AppUserVo> map=new HashMap<>();
         for (Integer userid:userids) {
-            AppUserDetail user = detailBiz.getUserByUserid(userid);
-            if (user == null) {
-                user=new AppUserDetail();
-                user.setHeadimgurl(SystemConfig.USER_HEADER_URL_DEFAULT);
+            AppUserVo userVo = detailBiz.getUserInfoById(userid);
+            if (userVo == null) {
+                userVo=new AppUserVo();
+                userVo.setHeadimgurl(SystemConfig.USER_HEADER_URL_DEFAULT);
+                userVo.setUserid(userid);
             }
 
-            map.put(userid,user);
+            map.put(userid,userVo);
             }
         return map;
         }