|
|
@@ -49,7 +49,7 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
|
|
|
String tableName = CommonConstants.KXS_USER_AMOUNT_LOG_PREFIX + param.getTradeMonth();
|
|
|
|
|
|
//拿出所有分类的子集ID集合
|
|
|
- if (CollUtil.isEmpty(param.getChangeType())) {
|
|
|
+ if (CollUtil.isNotEmpty(param.getChangeType())) {
|
|
|
|
|
|
List<KxsChangeTypeKind> kxsChangeTypeKinds = kxsChangeTypeKindMapper.selectList(Wrappers.<KxsChangeTypeKind>lambdaQuery()
|
|
|
.select(KxsChangeTypeKind::getId)
|
|
|
@@ -68,6 +68,13 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
|
|
|
|
|
|
//每个请求线程维护一个month数据,避免多线程数据冲突
|
|
|
MonthTableNameHandler.setData(param.getTradeMonth());
|
|
|
+ if (CollUtil.isNotEmpty(param.getChangeType())) {
|
|
|
+
|
|
|
+ List<KxsChangeTypeKind> kxsChangeTypeKinds = kxsChangeTypeKindMapper.selectList(Wrappers.<KxsChangeTypeKind>lambdaQuery()
|
|
|
+ .select(KxsChangeTypeKind::getId)
|
|
|
+ .in(KxsChangeTypeKind::getChangeTypeId, param.getChangeType()));
|
|
|
+ param.setChangeType(kxsChangeTypeKinds.stream().map(KxsChangeTypeKind::getId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
|
|
|
if(StrUtil.isBlank(param.getKind())|| param.getKind().equals(KindTypeEnum.ADD.getType())){
|
|
|
QueryWrapper<KxsUserAmountLog> queryWrapper = new QueryWrapper<>();
|