* 商品详情接口bug修复

src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.tdba.cxb.ares.api.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.tdba.cxb.ares.api.model.BaseUser;
 import com.tdba.cxb.ares.api.model.BindUserAdd;
 import com.tdba.cxb.ares.api.model.OperatorLoginReq;
@@ -14,12 +15,15 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.Objects;
 
+import static com.tdba.cxb.ares.api.config.PageEntityBuilder.buildByPageInfo;
 import static com.tdba.cxb.ares.api.model.TDBAResponseBuilder.buildSuccess;
 
 /**
@@ -28,6 +32,7 @@ import static com.tdba.cxb.ares.api.model.TDBAResponseBuilder.buildSuccess;
  * @author: libo
  * @create: 2022-06-06 17:48:41
  */
+@Validated
 @TDBAController("/api/v1/operate")
 public class UserController {
 
@@ -55,7 +60,7 @@ public class UserController {
      */
     @PostMapping("login")
     public TDBAResponse login(@RequestBody @Validated OperatorLoginReq param){
-        return buildSuccess("");
+        return buildSuccess(userService.login(param));
     }
 
     /**
@@ -65,7 +70,8 @@ public class UserController {
      */
     @GetMapping("bind_list")
     public TDBAResponse bind_list(BaseUser baseUser){
-        return buildSuccess("");
+        Objects.requireNonNull(baseUser, "请登录后操作");
+        return buildSuccess(buildByPageInfo(new PageInfo(userService.teamList(baseUser.getId()))));
     }
 
     /**
@@ -75,10 +81,23 @@ public class UserController {
      */
     @PostMapping("bind_add")
     public TDBAResponse bind_add(@RequestBody @Validated BindUserAdd param, BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
+        userService.teamAdd(param, baseUser);
+        return buildSuccess("");
+    }
+
+    @GetMapping("data_total")
+    public TDBAResponse data_total(BaseUser baseUser){
         return buildSuccess("");
     }
 
-    public static void main(String[] args) {
-        System.out.println(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
+    @GetMapping("data_list")
+    public TDBAResponse data_list(@RequestParam(name = "type", required = false) @NotNull(message = "类型不能为空") Integer type, BaseUser baseUser){
+        return buildSuccess("");
+    }
+
+    @GetMapping("detail_list")
+    public TDBAResponse detail_list(@RequestParam(name = "userId", required = false) Integer userId, BaseUser baseUser){
+        return buildSuccess("");
     }
 }

src/main/java/com/tdba/cxb/ares/api/model/BaseUser.java

@@ -6,44 +6,19 @@ package com.tdba.cxb.ares.api.model;
  */
 public class BaseUser {
 
-    /** 登录用户ID*/
-    private Integer loginId;
-
-
-    /** 企业ID*/
-    private Integer companyId;
-
     /** 用户ID*/
-    private Integer userId;
-
-    public Integer getLoginId() {
-        return loginId;
-    }
-
-    public void setLoginId(Integer loginId) {
-        this.loginId = loginId;
-    }
-
-    public Integer getCompanyId() {
-        return companyId;
-    }
+    private Integer id;
 
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
+    public Integer getId() {
+        return id;
     }
 
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
+    public void setId(Integer id) {
+        this.id = id;
     }
 
     public static final class BaseUserBuilder {
-        private Integer loginId;
-        private Integer companyId;
-        private Integer userId;
+        private Integer id;
 
         private BaseUserBuilder() {
         }
@@ -52,26 +27,14 @@ public class BaseUser {
             return new BaseUserBuilder();
         }
 
-        public BaseUserBuilder withLoginId(Integer loginId) {
-            this.loginId = loginId;
-            return this;
-        }
-
-        public BaseUserBuilder withCompanyId(Integer companyId) {
-            this.companyId = companyId;
-            return this;
-        }
-
-        public BaseUserBuilder withUserId(Integer userId) {
-            this.userId = userId;
+        public BaseUserBuilder withId(Integer id) {
+            this.id = id;
             return this;
         }
 
         public BaseUser build() {
             BaseUser baseUser = new BaseUser();
-            baseUser.setLoginId(loginId);
-            baseUser.setCompanyId(companyId);
-            baseUser.setUserId(userId);
+            baseUser.setId(id);
             return baseUser;
         }
     }

src/main/java/com/tdba/cxb/ares/api/model/DataListResp.java

@@ -0,0 +1,79 @@
+package com.tdba.cxb.ares.api.model;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @program: order-web
+ * @description:
+ * @author: libo
+ * @create: 2022-06-09 11:03:34
+ */
+public class DataListResp {
+
+    /** 普通用户数量*/
+    private Integer user_count = 0;
+
+    /** 大仓会员数量*/
+    private Integer warehouse_count = 0;
+
+    /** 商户数量*/
+    private Integer merchant_count = 0;
+
+    /** 渠道商数量*/
+    private Integer channel_count = 0;
+
+    /** 代理商数量*/
+    private Integer agent_count = 0;
+
+    /** 创建时间*/
+    private LocalDate date;
+
+    public Integer getUser_count() {
+        return user_count;
+    }
+
+    public void setUser_count(Integer user_count) {
+        this.user_count = user_count;
+    }
+
+    public Integer getWarehouse_count() {
+        return warehouse_count;
+    }
+
+    public void setWarehouse_count(Integer warehouse_count) {
+        this.warehouse_count = warehouse_count;
+    }
+
+    public Integer getMerchant_count() {
+        return merchant_count;
+    }
+
+    public void setMerchant_count(Integer merchant_count) {
+        this.merchant_count = merchant_count;
+    }
+
+    public Integer getChannel_count() {
+        return channel_count;
+    }
+
+    public void setChannel_count(Integer channel_count) {
+        this.channel_count = channel_count;
+    }
+
+    public Integer getAgent_count() {
+        return agent_count;
+    }
+
+    public void setAgent_count(Integer agent_count) {
+        this.agent_count = agent_count;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(LocalDate date) {
+        this.date = date;
+    }
+}

src/main/java/com/tdba/cxb/ares/api/model/DataTotalResp.java

@@ -0,0 +1,67 @@
+package com.tdba.cxb.ares.api.model;
+
+import java.time.LocalDateTime;
+
+/**
+ * @program: order-web
+ * @description:
+ * @author: libo
+ * @create: 2022-06-09 11:00:00
+ */
+public class DataTotalResp {
+
+    /** 普通用户数量*/
+    private Integer user_count = 0;
+
+    /** 大仓会员数量*/
+    private Integer warehouse_count = 0;
+
+    /** 商户数量*/
+    private Integer merchant_count = 0;
+
+    /** 渠道商数量*/
+    private Integer channel_count = 0;
+
+    /** 代理商数量*/
+    private Integer agent_count = 0;
+
+    public Integer getUser_count() {
+        return user_count;
+    }
+
+    public void setUser_count(Integer user_count) {
+        this.user_count = user_count;
+    }
+
+    public Integer getWarehouse_count() {
+        return warehouse_count;
+    }
+
+    public void setWarehouse_count(Integer warehouse_count) {
+        this.warehouse_count = warehouse_count;
+    }
+
+    public Integer getMerchant_count() {
+        return merchant_count;
+    }
+
+    public void setMerchant_count(Integer merchant_count) {
+        this.merchant_count = merchant_count;
+    }
+
+    public Integer getChannel_count() {
+        return channel_count;
+    }
+
+    public void setChannel_count(Integer channel_count) {
+        this.channel_count = channel_count;
+    }
+
+    public Integer getAgent_count() {
+        return agent_count;
+    }
+
+    public void setAgent_count(Integer agent_count) {
+        this.agent_count = agent_count;
+    }
+}

src/main/java/com/tdba/cxb/ares/api/model/DetailListResp.java

@@ -0,0 +1,43 @@
+package com.tdba.cxb.ares.api.model;
+
+/**
+ * @program: order-web
+ * @description:
+ * @author: libo
+ * @create: 2022-06-09 11:05:00
+ */
+public class DetailListResp {
+
+    /** 主键ID*/
+    private Integer id;
+
+    /** 用户名称*/
+    private String name;
+
+    /** 手机号*/
+    private String mobile;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+}

src/main/java/com/tdba/cxb/ares/api/model/UserBind.java

@@ -0,0 +1,135 @@
+package com.tdba.cxb.ares.api.model;
+
+import java.time.LocalDateTime;
+
+/**
+ * @program: order-web
+ * @description: 运营商绑定的团队信息
+ * @author: libo
+ * @create: 2022-06-09 10:30:42
+ */
+public class UserBind {
+
+    /** 主键ID*/
+    private Integer id;
+
+    /** 用户ID*/
+    private Integer uid;
+
+    /** 添加时间*/
+    private LocalDateTime createTime;
+
+    /** 删除标记:0否1是*/
+    private Integer delFlag;
+
+    /** 运营商用户ID(sys_user)*/
+    private Integer bindUid;
+
+    /** 类型:0正常统计1统计时过滤*/
+    private Integer type;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getBindUid() {
+        return bindUid;
+    }
+
+    public void setBindUid(Integer bindUid) {
+        this.bindUid = bindUid;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public static final class UserBindBuilder {
+        private Integer id;
+        private Integer uid;
+        private LocalDateTime createTime;
+        private Integer delFlag;
+        private Integer bindUid;
+        private Integer type;
+
+        private UserBindBuilder() {
+        }
+
+        public static UserBindBuilder anUserBind() {
+            return new UserBindBuilder();
+        }
+
+        public UserBindBuilder withId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        public UserBindBuilder withUid(Integer uid) {
+            this.uid = uid;
+            return this;
+        }
+
+        public UserBindBuilder withCreateTime(LocalDateTime createTime) {
+            this.createTime = createTime;
+            return this;
+        }
+
+        public UserBindBuilder withDelFlag(Integer delFlag) {
+            this.delFlag = delFlag;
+            return this;
+        }
+
+        public UserBindBuilder withBindUid(Integer bindUid) {
+            this.bindUid = bindUid;
+            return this;
+        }
+
+        public UserBindBuilder withType(Integer type) {
+            this.type = type;
+            return this;
+        }
+
+        public UserBind build() {
+            UserBind userBind = new UserBind();
+            userBind.setId(id);
+            userBind.setUid(uid);
+            userBind.setCreateTime(createTime);
+            userBind.setDelFlag(delFlag);
+            userBind.setBindUid(bindUid);
+            userBind.setType(type);
+            return userBind;
+        }
+    }
+}

src/main/java/com/tdba/cxb/ares/api/model/UserLoginResp.java

@@ -0,0 +1,61 @@
+package com.tdba.cxb.ares.api.model;
+
+/**
+ * @program: order-web
+ * @description: 登录返回信息
+ * @author: libo
+ * @create: 2022-06-08 17:31:41
+ */
+public class UserLoginResp {
+
+    /** 令牌*/
+    private String token;
+
+    /** 用户信息*/
+    private UserVo user;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public UserVo getUser() {
+        return user;
+    }
+
+    public void setUser(UserVo user) {
+        this.user = user;
+    }
+
+    public static final class UserLoginRespBuilder {
+        private String token;
+        private UserVo user;
+
+        private UserLoginRespBuilder() {
+        }
+
+        public static UserLoginRespBuilder anUserLoginResp() {
+            return new UserLoginRespBuilder();
+        }
+
+        public UserLoginRespBuilder withToken(String token) {
+            this.token = token;
+            return this;
+        }
+
+        public UserLoginRespBuilder withUser(UserVo user) {
+            this.user = user;
+            return this;
+        }
+
+        public UserLoginResp build() {
+            UserLoginResp userLoginResp = new UserLoginResp();
+            userLoginResp.setToken(token);
+            userLoginResp.setUser(user);
+            return userLoginResp;
+        }
+    }
+}

src/main/java/com/tdba/cxb/ares/api/model/UserRelate.java

@@ -1,5 +1,6 @@
 package com.tdba.cxb.ares.api.model;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -10,14 +11,40 @@ import java.time.LocalDateTime;
  */
 public class UserRelate {
 
+    /** 主键ID*/
+    private Integer id;
+
     /** 用户ID*/
     private Integer uid;
 
-    /** 关联用户ID*/
+    /** 有关联的用户ID*/
     private Integer pid;
 
-    /** 创建时间*/
-    private LocalDateTime create_time;
+    /** 删除标记:0否1是*/
+    private Integer delFlag;
+
+    /** 大仓会员:0否1是*/
+    private Integer isDacang;
+
+    /** 商家:0否1是*/
+    private Integer isMerchant;
+
+    /** 渠道商:0否1是*/
+    private Integer isChannel;
+
+    /** 代理商:0否1是*/
+    private Integer isAgent;
+
+    /** 日期*/
+    private LocalDate date;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
 
     public Integer getUid() {
         return uid;
@@ -35,18 +62,64 @@ public class UserRelate {
         this.pid = pid;
     }
 
-    public LocalDateTime getCreate_time() {
-        return create_time;
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getIsDacang() {
+        return isDacang;
+    }
+
+    public void setIsDacang(Integer isDacang) {
+        this.isDacang = isDacang;
+    }
+
+    public Integer getIsMerchant() {
+        return isMerchant;
+    }
+
+    public void setIsMerchant(Integer isMerchant) {
+        this.isMerchant = isMerchant;
+    }
+
+    public Integer getIsChannel() {
+        return isChannel;
+    }
+
+    public void setIsChannel(Integer isChannel) {
+        this.isChannel = isChannel;
     }
 
-    public void setCreate_time(LocalDateTime create_time) {
-        this.create_time = create_time;
+    public Integer getIsAgent() {
+        return isAgent;
+    }
+
+    public void setIsAgent(Integer isAgent) {
+        this.isAgent = isAgent;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(LocalDate date) {
+        this.date = date;
     }
 
     public static final class UserRelateBuilder {
+        private Integer id;
         private Integer uid;
         private Integer pid;
-        private LocalDateTime create_time;
+        private Integer delFlag;
+        private Integer isDacang;
+        private Integer isMerchant;
+        private Integer isChannel;
+        private Integer isAgent;
+        private LocalDate date;
 
         private UserRelateBuilder() {
         }
@@ -55,6 +128,11 @@ public class UserRelate {
             return new UserRelateBuilder();
         }
 
+        public UserRelateBuilder withId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
         public UserRelateBuilder withUid(Integer uid) {
             this.uid = uid;
             return this;
@@ -65,16 +143,47 @@ public class UserRelate {
             return this;
         }
 
-        public UserRelateBuilder withCreate_time(LocalDateTime create_time) {
-            this.create_time = create_time;
+        public UserRelateBuilder withDelFlag(Integer delFlag) {
+            this.delFlag = delFlag;
+            return this;
+        }
+
+        public UserRelateBuilder withIsDacang(Integer isDacang) {
+            this.isDacang = isDacang;
+            return this;
+        }
+
+        public UserRelateBuilder withIsMerchant(Integer isMerchant) {
+            this.isMerchant = isMerchant;
+            return this;
+        }
+
+        public UserRelateBuilder withIsChannel(Integer isChannel) {
+            this.isChannel = isChannel;
+            return this;
+        }
+
+        public UserRelateBuilder withIsAgent(Integer isAgent) {
+            this.isAgent = isAgent;
+            return this;
+        }
+
+        public UserRelateBuilder withDate(LocalDate date) {
+            this.date = date;
             return this;
         }
 
         public UserRelate build() {
             UserRelate userRelate = new UserRelate();
+            userRelate.setId(id);
             userRelate.setUid(uid);
             userRelate.setPid(pid);
-            userRelate.setCreate_time(create_time);
+            userRelate.setDelFlag(delFlag);
+            userRelate.setIsDacang(isDacang);
+            userRelate.setIsMerchant(isMerchant);
+            userRelate.setIsChannel(isChannel);
+            userRelate.setIsAgent(isAgent);
+            userRelate.setDate(date);
             return userRelate;
         }
     }

src/main/java/com/tdba/cxb/ares/api/model/UserVo.java

@@ -0,0 +1,133 @@
+package com.tdba.cxb.ares.api.model;
+
+/**
+ * @program: order-web
+ * @description: 登录用户
+ * @author: libo
+ * @create: 2022-06-08 17:32:49
+ */
+public class UserVo {
+
+    /** 主键ID*/
+    private Integer id;
+
+    /** 用户名称*/
+    private String name;
+
+    /** 手机号*/
+    private String mobile;
+
+    /** 用户头像*/
+    private String avatar;
+
+    /** 状态*/
+    private Integer status;
+
+    /** 团队名称*/
+    private String teamName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getTeamName() {
+        return teamName;
+    }
+
+    public void setTeamName(String teamName) {
+        this.teamName = teamName;
+    }
+
+    public static final class UserVoBuilder {
+        private Integer id;
+        private String name;
+        private String mobile;
+        private String avatar;
+        private Integer status;
+        private String teamName;
+
+        private UserVoBuilder() {
+        }
+
+        public static UserVoBuilder anUserVo() {
+            return new UserVoBuilder();
+        }
+
+        public UserVoBuilder withId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        public UserVoBuilder withName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public UserVoBuilder withMobile(String mobile) {
+            this.mobile = mobile;
+            return this;
+        }
+
+        public UserVoBuilder withAvatar(String avatar) {
+            this.avatar = avatar;
+            return this;
+        }
+
+        public UserVoBuilder withStatus(Integer status) {
+            this.status = status;
+            return this;
+        }
+
+        public UserVoBuilder withTeamName(String teamName) {
+            this.teamName = teamName;
+            return this;
+        }
+
+        public UserVo build() {
+            UserVo userVo = new UserVo();
+            userVo.setId(id);
+            userVo.setName(name);
+            userVo.setMobile(mobile);
+            userVo.setAvatar(avatar);
+            userVo.setStatus(status);
+            userVo.setTeamName(teamName);
+            return userVo;
+        }
+    }
+}

src/main/java/com/tdba/cxb/ares/api/repository/UserBindMapper.java

@@ -0,0 +1,25 @@
+package com.tdba.cxb.ares.api.repository;
+
+import com.tdba.cxb.ares.api.model.UserBind;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @program: order-web
+ * @description:
+ * @author: libo
+ * @create: 2022-06-09 10:32:52
+ */
+@Mapper
+public interface UserBindMapper {
+
+    int insertSelective(UserBind record);
+
+    int updateByPrimaryKeySelective(UserBind record);
+
+    UserBind selectByUid(@Param("uid") Integer uid);
+
+    List<Integer> selectUid(@Param("bindUid") Integer bindUid);
+}

src/main/java/com/tdba/cxb/ares/api/repository/UserMapper.java

@@ -1,6 +1,7 @@
 package com.tdba.cxb.ares.api.repository;
 
 import com.tdba.cxb.ares.api.model.UserDto;
+import com.tdba.cxb.ares.api.model.UserVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -36,4 +37,12 @@ public interface UserMapper {
 
     List<UserDto> selectAgent(@Param("beginTime")Long beginTime,
                                @Param("endTime")Long endTime);
+
+    UserVo selectByAccount(@Param("mobile") String mobile);
+
+    UserVo selectByUid(@Param("uid") Integer uid);
+
+    List<UserVo> selectByBindUid(@Param("bindUid") Integer bindUid);
+
+    UserVo selectByAccountForSimple(@Param("mobile") String mobile);
 }

src/main/java/com/tdba/cxb/ares/api/repository/UserRelateMapper.java

@@ -30,4 +30,7 @@ public interface UserRelateMapper {
 
     Integer updateByUid(@Param("userType") Integer userType,
                         @Param("uid") Integer uid);
+
+    Integer countByUid(@Param("uid") Integer uid,
+                       @Param("pidList") List<Integer> pidList);
 }

src/main/java/com/tdba/cxb/ares/api/service/UserService.java

@@ -1,16 +1,17 @@
 package com.tdba.cxb.ares.api.service;
 
-import com.tdba.cxb.ares.api.model.UserCount;
-import com.tdba.cxb.ares.api.model.UserDto;
-import com.tdba.cxb.ares.api.model.UserRelate;
-import com.tdba.cxb.ares.api.model.UserTypeEnum;
+import com.tdba.cxb.ares.api.model.*;
+import com.tdba.cxb.ares.api.repository.UserBindMapper;
 import com.tdba.cxb.ares.api.repository.UserCountMapper;
 import com.tdba.cxb.ares.api.repository.UserMapper;
 import com.tdba.cxb.ares.api.repository.UserRelateMapper;
+import com.tdba.cxb.ares.api.util.JwtUtil;
 import com.tdba.cxb.ares.api.util.TDBAException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -20,6 +21,7 @@ import java.time.LocalTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @program: order-web
@@ -41,6 +43,9 @@ public class UserService {
     @Resource
     private UserRelateMapper userRelateMapper;
 
+    @Resource
+    private UserBindMapper userBindMapper;
+
     public void createSpreadInfo(LocalDate localDate){
 
         LocalDateTime currentTime = LocalDateTime.now();
@@ -63,11 +68,13 @@ public class UserService {
                     relateList.add(UserRelate.UserRelateBuilder.anUserRelate()
                             .withUid(currentId)
                             .withPid(row.getUid())
+                            .withDate(localDate)
                             .build());
                     for(int j = i + 1; j < idlist.size(); j++){
                         relateList.add(UserRelate.UserRelateBuilder.anUserRelate()
                                 .withUid(idlist.get(j))
                                 .withPid(currentId)
+                                .withDate(localDate)
                                 .build());
                     }
                 }
@@ -79,6 +86,7 @@ public class UserService {
                 relateList.add(UserRelate.UserRelateBuilder.anUserRelate()
                         .withUid(row.getUid())
                         .withPid(row.getSpread_uid())
+                        .withDate(localDate)
                         .build());
                 //推荐人
                 resultList.add(UserCount.UserCountBuilder.anUserCount()
@@ -297,4 +305,98 @@ public class UserService {
         }
         return result;
     }
-}
+
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 登录
+     * @param param
+     * @return
+     */
+    public UserLoginResp login(OperatorLoginReq param){
+        if(!param.getCode().equals(redisTemplate.opsForValue().get("api.auth.sms." + param.getMobile()))){
+            throw new TDBAException("短信验证码有误");
+        }
+        redisTemplate.delete("api.auth.sms." + param.getMobile());
+
+        UserVo userVo = userMapper.selectByAccount(param.getMobile());
+        Objects.requireNonNull(userVo, "用户信息不存在");
+
+        return UserLoginResp.UserLoginRespBuilder.anUserLoginResp()
+                .withUser(userVo)
+                .withToken(JwtUtil.create(userVo.getId())).build();
+    }
+
+    /**
+     * 用户详情
+     * @param id
+     * @return
+     */
+    public UserVo info(Integer id){
+        UserVo userVo = userMapper.selectByUid(id);
+        Objects.requireNonNull(userVo, "用户信息不存在");
+        return userVo;
+    }
+
+    /**
+     * 团队列表
+     * @param id
+     * @return
+     */
+    public List<UserVo> teamList(Integer id){
+        List<UserVo> result = userMapper.selectByBindUid(id);
+        if(result.size() < 20){
+            int length = 20 - result.size();
+            for(int i = 0; i < length; i++){
+                result.add(UserVo.UserVoBuilder.anUserVo()
+                        .withAvatar("")
+                        .withId(0)
+                        .withMobile("")
+                        .withStatus(0)
+                        .withTeamName("")
+                        .build());
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 新增团队信息
+     * @param param
+     * @param baseUser
+     */
+    @Transactional
+    public void teamAdd(BindUserAdd param, BaseUser baseUser){
+        if(!param.getCode().equals(redisTemplate.opsForValue().get("api.auth.sms." + param.getMobile()))){
+            throw new TDBAException("短信验证码有误");
+        }
+        redisTemplate.delete("api.auth.sms." + param.getMobile());
+
+        UserVo userVo = userMapper.selectByAccountForSimple(param.getMobile());
+        Objects.requireNonNull(userVo, "该手机号未在【储蓄宝App】内注册，请先注册后再绑定");
+
+        if(userVo.getId() == baseUser.getId()){
+            throw new TDBAException("运营商不可添加自身为团队成员");
+        }
+
+        UserBind oldUserBind = userBindMapper.selectByUid(userVo.getId());
+        if(oldUserBind != null){
+            throw new TDBAException((oldUserBind.getBindUid() == baseUser.getId())? "手机号已添加，请勿重复操作": "该手机号已被其他运营商绑定");
+        }
+
+        List<Integer> oldUidList = userBindMapper.selectUid(baseUser.getId());
+        boolean isFilter = false;
+        if(!oldUidList.isEmpty()){
+            if(0 < userRelateMapper.countByUid(userVo.getId(), oldUidList)){
+                isFilter = true;
+            }
+        }
+        userBindMapper.insertSelective(UserBind.UserBindBuilder.anUserBind()
+                .withBindUid(baseUser.getId())
+                .withUid(userVo.getId())
+                .withCreateTime(LocalDateTime.now())
+                .withType(isFilter? 1: 0).build());
+    }
+}

src/main/java/com/tdba/cxb/ares/api/util/BaseUserArgumentResolver.java

@@ -9,6 +9,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 注入当前登录的用户信息
@@ -30,24 +31,20 @@ public class BaseUserArgumentResolver implements HandlerMethodArgumentResolver {
                                   ModelAndViewContainer mavContainer,
                                   NativeWebRequest webRequest,
                                   WebDataBinderFactory binderFactory)  {
-
-//        if((null != parameter) && parameter.getParameterType().equals(BaseUser.class)){
-//            String token = webRequest.getNativeRequest(HttpServletRequest.class).getHeader(BHConstant.HEADER_TOKEN);
-//            if (StringUtils.hasLength(token)) {
-//                return BaseUser.BaseUserBuilder.aBaseUser()
-//                        .loginId(JwtUtil.getClaimOfInt(token, BaseConstant.ACCOUNT))
-//                        .companyType(CompanyTypeEnum.values()[resolveNull(JwtUtil.getClaimOfInt(token, BaseConstant.COMPANY_TYPE))])
-//                        .companyId(JwtUtil.getClaimOfInt(token, BaseConstant.COMPANY_ID))
-//                        .userId(JwtUtil.getClaimOfInt(token, BaseConstant.USER_ID))
-//                        .userType(UserTypeEnum.values()[resolveNull(JwtUtil.getClaimOfInt(token, BaseConstant.USER_TYPE))])
-//                        .build();
-//            }
-//        }
-
+        if((null != parameter) && parameter.getParameterType().equals(BaseUser.class)){
+            String token = webRequest.getNativeRequest(HttpServletRequest.class).getHeader("X-Token");
+            BaseUser baseuser = null;
+            if (StringUtils.hasLength(token)) {
+                baseuser = BaseUser.BaseUserBuilder.aBaseUser()
+                        .withId(JwtUtil.resolveUserId(token))
+                        .build();
+            }
+
+            if(null == baseuser){
+                throw new TDBAException("请登录");
+            }
+            return baseuser;
+        }
         return null;
     }
-
-    private int resolveNull(Integer src){
-        return (null == src)? 0: src.intValue();
-    }
 }

src/main/java/com/tdba/cxb/ares/api/util/JwtUtil.java

@@ -0,0 +1,80 @@
+package com.tdba.cxb.ares.api.util;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.TokenExpiredException;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+
+/**
+ * @program: admin-web
+ * @description: jwt工具类
+ * @author: libo
+ * @create: 2022-06-01 16:56:13
+ */
+public class JwtUtil {
+
+
+    private static Logger log = LoggerFactory.getLogger(JwtUtil.class);
+
+    public static Integer resolveUserId(String token){
+        DecodedJWT jwt = JWT.decode(token);
+        List list = jwt.getClaim("jti").as(List.class);
+        log.info("{}", list);
+        return Integer.valueOf(list.get(0).toString());
+    }
+
+    private static String SECRET_KEY = "VliwSuvne";
+
+
+    /** 有效期 秒,默认为7天 */
+    public final static int Access_Expire = 86400 * 7;
+
+    /**
+     * 验证 令牌是否有效
+     * 签名验证, 过期时间戳验证
+     * @param token
+     * @return
+     */
+    public static boolean verify(String token){
+
+        if(!StringUtils.hasLength(token)){
+            return false;
+        }
+
+        try{
+            return null != JWT.require(Algorithm.HMAC256(SECRET_KEY)).build().verify(token);
+        }catch (TokenExpiredException e){
+            log.debug("token过期, {}", token);
+            return false;
+        }
+
+
+    }
+
+    /**
+     * 生成 令牌
+     * @return
+     */
+    public static String create(Integer uid){
+
+        Long timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8));
+        return JWT.create()
+                .withClaim("iss", "127.0.0.1")
+                .withClaim("aud", "127.0.0.1")
+                .withClaim("exp", timestamp + Access_Expire)
+                .withClaim("nbf", timestamp)
+                .withClaim("iat", timestamp)
+                .withClaim("jti", JSONArray.of(uid, "user"))
+                .sign(Algorithm.HMAC256(SECRET_KEY));
+    }
+}

src/main/java/com/tdba/cxb/ares/api/util/Sensitive.java

@@ -0,0 +1,22 @@
+package com.tdba.cxb.ares.api.util;
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @program: order-web
+ * @description: 脱敏
+ * @author: libo
+ * @create: 2022-06-08 17:22:04
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@JacksonAnnotationsInside
+@JsonSerialize(using = SensitiveSerializer.class)
+public @interface Sensitive {
+}

src/main/java/com/tdba/cxb/ares/api/util/SensitiveSerializer.java

@@ -0,0 +1,61 @@
+package com.tdba.cxb.ares.api.util;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @program: order-web
+ * @description: 脱敏
+ * @author: libo
+ * @create: 2022-06-08 17:22:57
+ */
+public class SensitiveSerializer extends JsonSerializer<String> implements ContextualSerializer {
+
+    private static Logger log = LoggerFactory.getLogger(SensitiveSerializer.class);
+
+    @Override
+    public void serialize(String value, JsonGenerator jgen, SerializerProvider provider) {
+        try {
+            String result = null;
+            if(StringUtils.hasText(value)) {
+                char[] array = value.toCharArray();
+                array[3] = 'x';
+                array[4] = 'x';
+                array[5] = 'x';
+                jgen.writeString(new String(array));
+            }
+        } catch (Exception e) {
+            log.error("脱敏处理异常 value = {}", value, e);
+        }
+    }
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) throws JsonMappingException {
+
+        if (beanProperty != null) { //为空直接跳过
+            if (Objects.equals(beanProperty.getType().getRawClass(), String.class)) { //非String类直接跳过
+                Sensitive image = beanProperty.getAnnotation(Sensitive.class);
+                if (image == null) {
+                    image = beanProperty.getContextAnnotation(Sensitive.class);
+                }
+                if (image != null) { //如果能得到注解，就将注解的value传入ImageURLSerialize
+                    return new SensitiveSerializer();
+                }
+            }
+            return serializerProvider.findValueSerializer(beanProperty.getType(), beanProperty);
+        }
+        return serializerProvider.findNullValueSerializer(beanProperty);
+    }
+}

src/main/java/module-info.java

@@ -23,4 +23,6 @@ open module order.web {
     requires org.mybatis;
     requires spring.aop;
     requires jdk.unsupported;
+    requires com.alibaba.fastjson2;
+    requires spring.tx;
 }

src/main/resources/mapper/UserBindMapper.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tdba.cxb.ares.api.repository.UserBindMapper">
+
+    <insert id="insertSelective">
+        insert into user_bind
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null != uid">
+                uid,
+            </if>
+            <if test="null != createTime">
+                create_time,
+            </if>
+            <if test="null != delFlag">
+                del_flag,
+            </if>
+            <if test="null != bindUid">
+                bind_uid,
+            </if>
+            <if test="null != type">
+                type,
+            </if>
+        </trim>
+
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null != uid">
+                #{ uid },
+            </if>
+            <if test="null != createTime">
+                #{ createTime },
+            </if>
+            <if test="null != delFlag">
+                #{ delFlag },
+            </if>
+            <if test="null != bindUid">
+                #{ bindUid },
+            </if>
+            <if test="null != type">
+                #{ type },
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective">
+        update user_bind
+        <set>
+            <if test="null != uid">
+                uid = #{ uid },
+            </if>
+            <if test="null != createTime">
+                create_time = #{ createTime },
+            </if>
+            <if test="null != delFlag">
+                del_flag = #{ delFlag },
+            </if>
+            <if test="null != bindUid">
+                bind_uid = #{ bindUid },
+            </if>
+            <if test="null != type">
+                type = #{ type },
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="selectByUid" resultType="com.tdba.cxb.ares.api.model.UserBind">
+        select * from user_bind where del_flag = 0 and uid = #{uid}
+    </select>
+
+    <select id="selectUid" resultType="java.lang.Integer">
+        select uid from user_bind where del_flag = 0 and type = 0 and bind_uid = #{bindUid}
+    </select>
+
+</mapper>

src/main/resources/mapper/UserMapper.xml

@@ -82,4 +82,72 @@
             and u.test_user = 0
             and u.spread_uid > 0
     </select>
+
+    <select id="selectByAccount" resultType="com.tdba.cxb.ares.api.model.UserVo">
+        select
+            u.account 'mobile',
+                u.uid 'id',
+                u.nickname 'name',
+                u.avatar
+        from
+            user_operator uo
+                left join
+            rrx_user u
+            on uo.uid = u.uid
+        where
+            uo.del_flag = 0
+          and u.status = 1
+          and  u.account = #{mobile}
+        limit 1
+    </select>
+
+    <select id="selectByUid" resultType="com.tdba.cxb.ares.api.model.UserVo">
+        select
+            u.account 'mobile',
+                u.uid 'id',
+                u.nickname 'name',
+                u.avatar
+        from
+            user_operator uo
+                left join
+            rrx_user u
+            on uo.uid = u.uid
+        where
+            uo.del_flag = 0
+          and u.status = 1
+          and  u.uid = #{uid}
+            limit 1
+    </select>
+
+    <select id="selectByBindUid" resultType="com.tdba.cxb.ares.api.model.UserVo">
+        select
+            u.account 'mobile',
+                u.uid 'id',
+                u.nickname 'name',
+                u.avatar,
+            '1' as 'status'
+        from
+            user_bind ub
+                left join
+            rrx_user u
+            on ub.uid = u.uid
+        where
+            ub.del_flag = 0
+          and u.test_user = 0
+          and ub.bind_uid = #{bindUid}
+    </select>
+
+    <select id="selectByAccountForSimple" resultType="com.tdba.cxb.ares.api.model.UserVo">
+        select
+            u.account 'mobile',
+                u.uid 'id',
+                u.nickname 'name',
+                u.avatar
+        from
+            rrx_user u
+        where
+            u.test_user = 0
+          and u.account = #{mobile}
+        limit 1
+    </select>
 </mapper>

src/main/resources/mapper/UserRelateMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.tdba.cxb.ares.api.repository.UserRelateMapper">
-
     <insert id="insertSelective">
         insert into user_relate
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -11,9 +10,24 @@
             <if test="null != pid">
                 pid,
             </if>
-            <if test="null != del_flag">
+            <if test="null != delFlag">
                 del_flag,
             </if>
+            <if test="null != isDacang">
+                is_dacang,
+            </if>
+            <if test="null != isMerchant">
+                is_merchant,
+            </if>
+            <if test="null != isChannel">
+                is_channel,
+            </if>
+            <if test="null != isAgent">
+                is_agent,
+            </if>
+            <if test="null != date">
+                date,
+            </if>
         </trim>
 
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -23,8 +37,23 @@
             <if test="null != pid">
                 #{ pid },
             </if>
-            <if test="null != del_flag">
-                #{del_flag},
+            <if test="null != delFlag">
+                #{ delFlag },
+            </if>
+            <if test="null != isDacang">
+                #{ isDacang },
+            </if>
+            <if test="null != isMerchant">
+                #{ isMerchant },
+            </if>
+            <if test="null != isChannel">
+                #{ isChannel },
+            </if>
+            <if test="null != isAgent">
+                #{ isAgent },
+            </if>
+            <if test="null != date">
+                #{ date },
             </if>
         </trim>
     </insert>
@@ -38,8 +67,23 @@
             <if test="null != pid">
                 pid = #{ pid },
             </if>
-            <if test="null != del_flag">
-                del_flag = #{del_flag},
+            <if test="null != delFlag">
+                del_flag = #{ delFlag },
+            </if>
+            <if test="null != isDacang">
+                is_dacang = #{ isDacang },
+            </if>
+            <if test="null != isMerchant">
+                is_merchant = #{ isMerchant },
+            </if>
+            <if test="null != isChannel">
+                is_channel = #{ isChannel },
+            </if>
+            <if test="null != isAgent">
+                is_agent = #{ isAgent },
+            </if>
+            <if test="null != date">
+                date = #{ date },
             </if>
         </set>
         where id = #{id}
@@ -49,12 +93,22 @@
         insert into user_relate
         (
         uid,
-        pid      )
+        pid,
+        is_dacang,
+        is_merchant,
+        is_channel,
+        is_agent,
+        date        )
         values
         <foreach collection="list" separator="," item="row">
             (
             #{row.uid },
-            #{row.pid }       )
+            #{row.pid },
+            #{row.isDacang },
+            #{row.isMerchant },
+            #{row.isChannel },
+            #{row.isAgent },
+            #{row.date }            )
         </foreach>
     </insert>
 
@@ -79,4 +133,16 @@
 
         where uid = #{uid}
     </select>
+
+    <select id="countByUid" resultType="java.lang.Integer">
+        select
+            count(1)
+        from
+            user_relate
+        where
+            del_flag = 0
+          and uid = #{uid}
+          and pid in
+        <foreach collection="pidList" item="item" open="(" separator="," close=")"></foreach>
+    </select>
 </mapper>