|
|
@@ -123,18 +123,18 @@ public class UserService {
|
|
123
|
123
|
});
|
|
124
|
124
|
}
|
|
125
|
125
|
if(!relateList.isEmpty()){
|
|
126
|
|
- userRelateMapper.insertSelectiveForeach(relateList);
|
|
|
126
|
+// userRelateMapper.insertSelectiveForeach(relateList);
|
|
127
|
127
|
}
|
|
128
|
128
|
relateList.clear();
|
|
129
|
129
|
});
|
|
130
|
130
|
if(!resultList.isEmpty()){
|
|
131
|
|
- userCountMapper.insertSelectiveForeach(resultList);
|
|
|
131
|
+// userCountMapper.insertSelectiveForeach(resultList);
|
|
132
|
132
|
}
|
|
133
|
133
|
|
|
134
|
134
|
resolverAgent(localDate);
|
|
135
|
|
- resolverDacang(localDate);
|
|
136
|
|
- resolverMerchant(localDate);
|
|
137
|
|
- resolverChannel(localDate);
|
|
|
135
|
+// resolverDacang(localDate);
|
|
|
136
|
+// resolverMerchant(localDate);
|
|
|
137
|
+// resolverChannel(localDate);
|
|
138
|
138
|
}
|
|
139
|
139
|
|
|
140
|
140
|
/**
|
|
|
@@ -154,7 +154,7 @@ public class UserService {
|
|
154
|
154
|
.withUser_type(UserTypeEnum.DACANG.ordinal())
|
|
155
|
155
|
.withCreate_time(currentTime)
|
|
156
|
156
|
.build());
|
|
157
|
|
- userRelateMapper.updateByUidList(UserTypeEnum.DACANG.ordinal(), row.getUid_concat());
|
|
|
157
|
+ userRelateMapper.updateByUidList(UserTypeEnum.DACANG.ordinal(), row.getUid_concat().split(","));
|
|
158
|
158
|
|
|
159
|
159
|
userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
|
|
160
|
160
|
resultList.add(UserCount.UserCountBuilder.anUserCount()
|
|
|
@@ -199,7 +199,7 @@ public class UserService {
|
|
199
|
199
|
.withUser_type(UserTypeEnum.MERCHANT.ordinal())
|
|
200
|
200
|
.withCreate_time(currentTime)
|
|
201
|
201
|
.build());
|
|
202
|
|
- userRelateMapper.updateByUidList(UserTypeEnum.MERCHANT.ordinal(), row.getUid_concat());
|
|
|
202
|
+ userRelateMapper.updateByUidList(UserTypeEnum.MERCHANT.ordinal(), row.getUid_concat().split(","));
|
|
203
|
203
|
|
|
204
|
204
|
userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
|
|
205
|
205
|
resultList.add(UserCount.UserCountBuilder.anUserCount()
|
|
|
@@ -234,7 +234,7 @@ public class UserService {
|
|
234
|
234
|
.withUser_type(UserTypeEnum.CHANNEL.ordinal())
|
|
235
|
235
|
.withCreate_time(currentTime)
|
|
236
|
236
|
.build());
|
|
237
|
|
- userRelateMapper.updateByUidList(UserTypeEnum.CHANNEL.ordinal(), row.getUid_concat());
|
|
|
237
|
+ userRelateMapper.updateByUidList(UserTypeEnum.CHANNEL.ordinal(), row.getUid_concat().split(","));
|
|
238
|
238
|
|
|
239
|
239
|
userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
|
|
240
|
240
|
resultList.add(UserCount.UserCountBuilder.anUserCount()
|
|
|
@@ -269,7 +269,7 @@ public class UserService {
|
|
269
|
269
|
.withUser_type(UserTypeEnum.AGENT.ordinal())
|
|
270
|
270
|
.withCreate_time(currentTime)
|
|
271
|
271
|
.build());
|
|
272
|
|
- userRelateMapper.updateByUidList(UserTypeEnum.AGENT.ordinal(), row.getUid_concat());
|
|
|
272
|
+ userRelateMapper.updateByUidList(UserTypeEnum.AGENT.ordinal(), row.getUid_concat().split(","));
|
|
273
|
273
|
|
|
274
|
274
|
userRelateMapper.selectByUid(row.getSpread_uid()).stream().forEach(innerRow -> {
|
|
275
|
275
|
resultList.add(UserCount.UserCountBuilder.anUserCount()
|
|
|
@@ -329,7 +329,7 @@ public class UserService {
|
|
329
|
329
|
logger.error("循环嵌套 row.getSpread_uid() = {}, userDto.getUid() = {}", row.getSpread_uid(), userDto.getSpread_uid());
|
|
330
|
330
|
throw new TDBAException("循环嵌套");
|
|
331
|
331
|
}
|
|
332
|
|
- result = 1 + countOfChildren(row, list);
|
|
|
332
|
+ result += 1 + countOfChildren(row, list);
|
|
333
|
333
|
}
|
|
334
|
334
|
}
|
|
335
|
335
|
return result;
|