* init

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

@@ -136,4 +136,8 @@ public class UserController {
         return buildSuccess("退出成功");
     }
 
+    public static void main(String[] args) {
+        System.out.println(LocalDateTime.of(2022, 06, 10, 00, 00, 00).toEpochSecond(ZoneOffset.ofHours(8)));
+        System.out.println(LocalDateTime.of(2022, 06, 10, 23, 59, 59).toEpochSecond(ZoneOffset.ofHours(8)));
+    }
 }

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

@@ -199,7 +199,7 @@ public class UserService {
                         .withUser_type(UserTypeEnum.MERCHANT.ordinal())
                         .withCreate_time(currentTime)
                         .build());
-                userRelateMapper.updateByUid(UserTypeEnum.MERCHANT.ordinal(), row.getSpread_uid());
+                userRelateMapper.updateByUidList(UserTypeEnum.MERCHANT.ordinal(), row.getUid_concat());
 
                 userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
                     resultList.add(UserCount.UserCountBuilder.anUserCount()
@@ -234,7 +234,7 @@ public class UserService {
                         .withUser_type(UserTypeEnum.CHANNEL.ordinal())
                         .withCreate_time(currentTime)
                         .build());
-                userRelateMapper.updateByUid(UserTypeEnum.CHANNEL.ordinal(), row.getSpread_uid());
+                userRelateMapper.updateByUidList(UserTypeEnum.CHANNEL.ordinal(), row.getUid_concat());
 
                 userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
                     resultList.add(UserCount.UserCountBuilder.anUserCount()
@@ -269,7 +269,7 @@ public class UserService {
                         .withUser_type(UserTypeEnum.AGENT.ordinal())
                         .withCreate_time(currentTime)
                         .build());
-                userRelateMapper.updateByUid(UserTypeEnum.AGENT.ordinal(), row.getSpread_uid());
+                userRelateMapper.updateByUidList(UserTypeEnum.AGENT.ordinal(), row.getUid_concat());
 
                 userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
                     resultList.add(UserCount.UserCountBuilder.anUserCount()
@@ -311,7 +311,7 @@ public class UserService {
 
     private Integer countOfChildren(UserDto userDto, List<UserDto> list){
 
-        if(userDto == null || CollectionUtils.isEmpty(list) || userDto.getSpread_uid().equals(0)){
+        if(userDto == null || CollectionUtils.isEmpty(list)){
             return 0;
         }
 
@@ -401,9 +401,9 @@ public class UserService {
         UserVo userVo = userMapper.selectByAccountForSimple(param.getPhone());
         Objects.requireNonNull(userVo, "该手机号未在【储蓄宝App】内注册，请先注册后再绑定");
 
-        if(userVo.getId().equals(baseUser.getId())){
-            throw new TDBAException("运营商不可添加自身为团队成员");
-        }
+//        if(userVo.getId().equals(baseUser.getId())){
+//            throw new TDBAException("运营商不可添加自身为团队成员");
+//        }
 
         UserBind oldUserBind = userBindMapper.selectByUid(userVo.getId());
         if(oldUserBind != null){

src/main/resources/application-dev.yml

@@ -1,14 +1,15 @@
 spring:
   datasource:
-    url: jdbc:mysql://10.28.5.46:3306/renrenxiang?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://10.28.5.47:3306/renrenxiang?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.cj.jdbc.Driver
-    password: Zm#T2ZW4#IwENBY
-    username: root
+    password: bjtdba.com
+    username: readonly
     hikari:
       maximum-pool-size: 16
       minimum-idle: 2
       idle-timeout: 10000
 
+
   redis:
     host: 10.28.5.46
     port: 6379

src/main/resources/mapper/UserMapper.xml

@@ -35,7 +35,8 @@
     <select id="selectMerchant" resultType="com.tdba.cxb.ares.api.model.UserDto">
         select
             count(1) 'num',
-            u.spread_uid
+            u.spread_uid,
+            group_concat(u.uid) 'uid_concat'
         from
             rrx_merchant_admin da
             left join
@@ -52,7 +53,8 @@
     <select id="selectChannel" resultType="com.tdba.cxb.ares.api.model.UserDto">
         select
             count(1) 'num',
-            u.spread_uid
+            u.spread_uid,
+            group_concat(u.uid) 'uid_concat'
         from
             rrx_channel_user da
         left join
@@ -69,7 +71,8 @@
     <select id="selectAgent" resultType="com.tdba.cxb.ares.api.model.UserDto">
         select
             count(1) 'num',
-            u.spread_uid
+            u.spread_uid,
+            group_concat(u.uid) 'uid_concat'
         from
             rrx_user_agent da
             left join