* init

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

@@ -12,11 +12,15 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
+import java.security.Identity;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static com.tdba.cxb.ares.api.config.PageEntityBuilder.buildByPageInfo;
 import static com.tdba.cxb.ares.api.model.TDBAResponseBuilder.buildSuccess;
@@ -85,21 +89,27 @@ public class UserController {
     @GetMapping("data_total")
     public TDBAResponse data_total(BaseUser baseUser){
         Objects.requireNonNull(baseUser, "请登录后操作");
-        return buildSuccess("");
+        return buildSuccess(userService.dataTotal(baseUser).stream().collect(Collectors.toMap(DataTotalResp::getUser_type, DataTotalResp::getCount)));
     }
 
     @GetMapping("data_list")
-    public TDBAResponse data_list(@RequestParam(name = "type", required = false) @NotNull(message = "类型不能为空") Integer type, BaseUser baseUser){
+    public TDBAResponse data_list(@ModelAttribute @Validated DataLIstReq param, BaseUser baseUser){
         Objects.requireNonNull(baseUser, "请登录后操作");
-
-        return buildSuccess("");
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return buildSuccess(buildByPageInfo(new PageInfo(userService.dataList(param, baseUser))));
     }
 
     @GetMapping("detail_list")
-    public TDBAResponse detail_list(@RequestParam(name = "userId", required = false) @NotNull(message = "用户ID不能为空") Integer userId,
-                                    @RequestParam(name = "userType", required = false) Integer userType, BaseUser baseUser){
-//        Objects.requireNonNull(baseUser, "请登录后操作");
-        return buildSuccess(userService.detailList(userId, userType));
+    public TDBAResponse detail_list(@ModelAttribute @Validated DetailListReq param, BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return buildSuccess(buildByPageInfo(new PageInfo(userService.detailList(param.getUser_id(), param.getUser_type()))));
+    }
+
+    @GetMapping("info")
+    public TDBAResponse info(BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
+        return buildSuccess(userService.info(baseUser.getId()));
     }
 
     public static void main(String[] args) {

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

@@ -0,0 +1,23 @@
+package com.tdba.cxb.ares.api.model;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @program: order-web
+ * @description:
+ * @author: libo
+ * @create: 2022-06-10 16:53:21
+ */
+public class DataLIstReq extends PageParam {
+
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

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

@@ -11,6 +11,8 @@ import java.time.LocalDateTime;
  */
 public class DataListResp {
 
+    private String date;
+
     /** 普通用户数量*/
     private Integer user_count = 0;
 
@@ -26,8 +28,13 @@ public class DataListResp {
     /** 代理商数量*/
     private Integer agent_count = 0;
 
-    /** 创建时间*/
-    private LocalDate date;
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
 
     public Integer getUser_count() {
         return user_count;
@@ -68,12 +75,4 @@ public class DataListResp {
     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

@@ -10,58 +10,25 @@ import java.time.LocalDateTime;
  */
 public class DataTotalResp {
 
-    /** 普通用户数量*/
-    private Integer user_count = 0;
+    /** 用户类型*/
+    private Integer user_type = 0;
 
-    /** 大仓会员数量*/
-    private Integer warehouse_count = 0;
+    /** 数量*/
+    private Integer 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 Integer getUser_type() {
+        return user_type;
     }
 
-    public void setChannel_count(Integer channel_count) {
-        this.channel_count = channel_count;
+    public void setUser_type(Integer user_type) {
+        this.user_type = user_type;
     }
 
-    public Integer getAgent_count() {
-        return agent_count;
+    public Integer getCount() {
+        return count;
     }
 
-    public void setAgent_count(Integer agent_count) {
-        this.agent_count = agent_count;
+    public void setCount(Integer count) {
+        this.count = count;
     }
 }

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

@@ -0,0 +1,36 @@
+package com.tdba.cxb.ares.api.model;
+
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @program: order-web
+ * @description:
+ * @author: libo
+ * @create: 2022-06-10 16:57:36
+ */
+public class DetailListReq extends PageParam{
+
+    @NotNull(message = "用户ID不能为空")
+    private Integer user_id;
+
+    @NotNull(message = "用户类型不能为空")
+    private Integer user_type;
+
+    public Integer getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(Integer user_id) {
+        this.user_id = user_id;
+    }
+
+    public Integer getUser_type() {
+        return user_type;
+    }
+
+    public void setUser_type(Integer user_type) {
+        this.user_type = user_type;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.tdba.cxb.ares.api.repository;
 
+import com.tdba.cxb.ares.api.model.DataListResp;
+import com.tdba.cxb.ares.api.model.DataTotalResp;
 import com.tdba.cxb.ares.api.model.UserDto;
 import com.tdba.cxb.ares.api.model.UserVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +48,8 @@ public interface UserMapper {
     List<UserVo> selectByBindUid(@Param("bindUid") Integer bindUid);
 
     UserVo selectByAccountForSimple(@Param("mobile") String mobile);
+
+    List<DataTotalResp> selectTotal(@Param("uid") Integer uid);
+    List<DataListResp> selectList(@Param("type") Integer type,
+                                  @Param("uid") Integer uid);
 }

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

@@ -427,4 +427,17 @@ public class UserService {
     public List<DetailListResp> detailList(Integer uid, Integer userType){
         return userRelateMapper.selectByPid(uid, (null == userType)?0:userType);
     }
+
+    /**
+     * 用户数量统计
+     * @param baseUser
+     * @return
+     */
+    public List<DataTotalResp> dataTotal(BaseUser baseUser){
+        return userMapper.selectTotal(baseUser.getId());
+    }
+
+    public List<DataListResp> dataList(DataLIstReq param, BaseUser baseUser){
+        return userMapper.selectList(param.getType(), baseUser.getId());
+    }
 }

src/main/resources/mapper/UserMapper.xml

@@ -149,4 +149,72 @@
            u.account = #{mobile}
         limit 1
     </select>
+
+    <select id="selectTotal" resultType="com.tdba.cxb.ares.api.model.DataTotalResp">
+        select
+            user_type,
+            sum(num) 'count'
+        from
+            user_count
+        where
+            del_flag = 0
+          and uid in (
+            select
+                uid
+            from
+                user_bind ub
+            where
+                ub.del_flag = 0
+              and ub.bind_uid = #{uid}
+        )
+        group by
+            user_type
+    </select>
+
+    <select id="selectList" resultType="com.tdba.cxb.ares.api.model.DataListResp">
+        select
+            <choose>
+                <when test="type == null || type == 0">
+                    DATE_FORMAT(date,'%Y-%m-%d') as 'date',
+                </when>
+                <when test="type == 1">
+                    DATE_FORMAT(date,'%Y-%m') as 'date',
+                </when>
+            </choose>
+            sum(IF(user_type = 0, num, 0)) as 'user_count',
+            sum(IF(user_type = 1, num, 0)) as 'warehouse_count',
+            sum(IF(user_type = 2, num, 0)) as 'merchant_count',
+            sum(IF(user_type = 3, num, 0)) as 'channel_count',
+            sum(IF(user_type = 4, num, 0)) as 'agent_count'
+        from
+            user_count
+        where
+            del_flag = 0
+            and uid in (
+                select
+                    uid
+                    from
+                        user_bind ub
+                    where
+                        ub.del_flag = 0
+                        and ub.bind_uid = #{uid}
+            )
+        <choose>
+            <when test="type == null || type == 0">
+                group by `date`
+            </when>
+            <when test="type == 1">
+                group by DATE_FORMAT(date,'%Y-%m')
+            </when>
+        </choose>
+
+        <choose>
+            <when test="type == null || type == 0">
+                order by `date` desc
+            </when>
+            <when test="type == 1">
+                order by DATE_FORMAT(date,'%Y-%m') desc
+            </when>
+        </choose>
+    </select>
 </mapper>

src/main/resources/mapper/UserRelateMapper.xml

@@ -162,7 +162,7 @@
         select
             u.account 'mobile',
                 u.uid 'id',
-                u.nickname 'name'
+                u.nickname 'name',
                 ur.date
         from
             user_relate ur
@@ -208,5 +208,6 @@
                 and ur.is_agent = 0
             </otherwise>
         </choose>
+        order by date desc
     </select>
 </mapper>