* init

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

@@ -89,11 +89,7 @@ public class UserController {
     @GetMapping("data_total")
     public TDBAResponse data_total(BaseUser baseUser){
         Objects.requireNonNull(baseUser, "请登录后操作");
-        Map<Integer, Integer> result = userService.dataTotal(baseUser).stream().collect(Collectors.toMap(DataTotalResp::getUser_type, DataTotalResp::getCount));
-        if(result.isEmpty()){
-            result = Map.of(0, 0, 1, 0, 2, 0, 3, 0);
-        }
-        return buildSuccess(result);
+        return buildSuccess(userService.dataTotal(baseUser));
     }
 
     @GetMapping("data_list")

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

@@ -16,6 +16,9 @@ public class DataTotalResp {
     /** 数量*/
     private Integer count = 0;
 
+    /** 名称*/
+    private String name;
+
     public Integer getUser_type() {
         return user_type;
     }
@@ -31,4 +34,48 @@ public class DataTotalResp {
     public void setCount(Integer count) {
         this.count = count;
     }
-}
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public static final class DataTotalRespBuilder {
+        private Integer user_type = 0;
+        private Integer count = 0;
+        private String name;
+
+        private DataTotalRespBuilder() {
+        }
+
+        public static DataTotalRespBuilder aDataTotalResp() {
+            return new DataTotalRespBuilder();
+        }
+
+        public DataTotalRespBuilder withUser_type(Integer user_type) {
+            this.user_type = user_type;
+            return this;
+        }
+
+        public DataTotalRespBuilder withCount(Integer count) {
+            this.count = count;
+            return this;
+        }
+
+        public DataTotalRespBuilder withName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public DataTotalResp build() {
+            DataTotalResp dataTotalResp = new DataTotalResp();
+            dataTotalResp.setUser_type(user_type);
+            dataTotalResp.setCount(count);
+            dataTotalResp.setName(name);
+            return dataTotalResp;
+        }
+    }
+}

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

@@ -441,7 +441,40 @@ public class UserService {
      * @return
      */
     public List<DataTotalResp> dataTotal(BaseUser baseUser){
-        return userMapper.selectTotal(baseUser.getId());
+        List<DataTotalResp> list = userMapper.selectTotal(baseUser.getId());
+        if(list.isEmpty()){
+            list = List.of(
+                    DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
+                            .withUser_type(0)
+                            .withCount(0)
+                            .build(),
+                    DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
+                            .withUser_type(1)
+                            .withCount(0)
+                            .build(),
+                    DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
+                            .withUser_type(2)
+                            .withCount(0)
+                            .build(),
+                    DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
+                            .withUser_type(3)
+                            .withCount(0)
+                            .build(),
+                    DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
+                            .withUser_type(4)
+                            .withCount(0)
+                            .build());
+        }
+        return list.stream().map(row -> {
+            row.setName(switch (row.getUser_type()){
+                case 0 -> "普通用户";
+                case 1 -> "大仓会员";
+                case 2 -> "商户";
+                case 3 -> "渠道商";
+                case 4 -> "代理商";
+            });
+            return row;
+        }).toList();
     }
 
     public List<DataListResp> dataList(DataLIstReq param, BaseUser baseUser){