suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改公海私海分页

Browse Source
This commit is contained in:
xiaodong.hu
2023-11-13 13:37:58 +08:00
parent 53eb52227a
commit 7b877e7cda
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -964,6 +964,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
@Override
public LinePageInfoVo privateSeaPageDetailNext(String userId, PrivateSeaLineListRequest request, Boolean allPrivateSeaFlag) {
request.setPageNum((int) Math.ceil((double) request.getPageNum() / request.getPageSize()));
//allPrivateSeaFlag 为true的时候 查询全量私海
UserPositionAndUserScopeDTO userIdsByScope = new UserPositionAndUserScopeDTO();
if (!allPrivateSeaFlag) {
@@ -995,10 +996,26 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
@Override
public LinePageInfoVo publicSeaPageDetailNext(String userId, LineRequest lineRequest) {
lineRequest.setPageNum((int) Math.ceil((double) lineRequest.getPageNum() / lineRequest.getPageSize()));
String intentAreaName = getIntentAreaName(lineRequest.getIntentArea());
LinePageInfoVo linePageInfoVo = hyPartnerLineInfoDAO.getPublicSeaPageInfoNext(lineRequest.getLineId(), lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
intentAreaName, lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null, lineRequest.getCreateStartTime(), lineRequest.getCreateEndTime(),lineRequest.getPageTurn());
return linePageInfoVo;
Integer pageNum = lineRequest.getPageNum();
Integer pageSize = lineRequest.getPageSize();
List<LinePageInfoVo> linePageInfoVoList = hyPartnerLineInfoDAO.getPublicSeaPageInfoNext(lineRequest.getLineId(), lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
intentAreaName, lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null, lineRequest.getCreateStartTime(), lineRequest.getCreateEndTime(),lineRequest.getPageTurn()
, (pageNum - 1) * pageSize == 0 ? 0 : (pageNum - 1) * pageSize - 1, pageSize + 2);
Optional<Integer> first = Stream.iterate(0, i -> i + 1).limit(linePageInfoVoList.size()).filter(item -> lineRequest.getLineId().equals(linePageInfoVoList.get(item).getLineId())).findFirst();
if (!first.isPresent()) {
return null;
}
if (PageTurnTypeEnum.NEXT.getText().equals(lineRequest.getPageTurn())) {
//下一页
return first.get() +1>linePageInfoVoList.size()?null:linePageInfoVoList.get(first.get() +1);
}
if (PageTurnTypeEnum.PREVIOUS.getText().equals(lineRequest.getPageTurn())) {
//上一页
return first.get() - 1<0?null:linePageInfoVoList.get(first.get() - 1);
}
return null;
}