|
@@ -2,6 +2,7 @@ package com.ytpm.service.impl;
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.text.CharSequenceUtil;
|
|
import cn.hutool.core.text.CharSequenceUtil;
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import com.ytpm.agent.model.YtApp;
|
|
import com.ytpm.agent.model.YtApp;
|
|
|
import com.ytpm.agent.view.AgentUserInfo;
|
|
import com.ytpm.agent.view.AgentUserInfo;
|
|
@@ -149,12 +150,14 @@ public class YtAppUserServiceImpl implements YtAppUserService {
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public Result<BigDecimal> getRevenueByTime(YtAppUserListParam param, String userId) {
|
|
public Result<BigDecimal> getRevenueByTime(YtAppUserListParam param, String userId) {
|
|
|
- List<YtApp> ytApps = appMapper.queryAll(userId);
|
|
|
|
|
- if(CollUtil.isEmpty(ytApps)) {
|
|
|
|
|
- return Result.resultObjOk(BigDecimal.ZERO);
|
|
|
|
|
|
|
+ if(StrUtil.isBlank(param.getAppIds())){
|
|
|
|
|
+ List<YtApp> ytApps = appMapper.queryAll(userId);
|
|
|
|
|
+ if(CollUtil.isEmpty(ytApps)) {
|
|
|
|
|
+ return Result.resultObjOk(BigDecimal.ZERO);
|
|
|
|
|
+ }
|
|
|
|
|
+ String appIds = ytApps.stream().map(YtApp::getAppId).collect(Collectors.joining(","));
|
|
|
|
|
+ param.setAppIds(appIds);
|
|
|
}
|
|
}
|
|
|
- String appIds = ytApps.stream().map(YtApp::getAppId).collect(Collectors.joining(","));
|
|
|
|
|
- param.setAppIds(appIds);
|
|
|
|
|
return Result.resultObjOk(appFeign.getRevenueByTime(param));
|
|
return Result.resultObjOk(appFeign.getRevenueByTime(param));
|
|
|
}
|
|
}
|
|
|
|
|
|