Commit 2e28198c by 李传峰

feat:[none] fix取值逻辑

parent 0c80f1c7
...@@ -86,18 +86,19 @@ public class BookElasticSearchBizImpl { ...@@ -86,18 +86,19 @@ public class BookElasticSearchBizImpl {
bookFundDto.getLastModifiedUser(), bookFundDto.getLastModifiedUser(),
bookFundDto.getOperateUserName())); bookFundDto.getOperateUserName()));
isFundSupport = new Date().before(endTime); if (new Date().before(endTime)) {
isFundSupport = true;
}
} }
bookDto.setIsHaveFund(true); bookDto.setIsHaveFund(true);
} }
bookDto.setTransferor(transferor); bookDto.setTransferor(transferor);
bookDto.setIsFundSupport(isFundSupport); bookDto.setIsFundSupport(isFundSupport);
bookDto.setFreezeStatus(freezeStatus); bookDto.setFreezeStatus(BooleanUtils.toIntegerObject(findFreezedRecord(esBook.getBookFreezeList()) == null,
freezeStatus, BookFreezeEnum.FREEZE.value));
bookDto.setIsHaveAdviser(esBook.getIsAdviserBook() && esBook.getIsBookAdviserDelete()); bookDto.setIsHaveAdviser(esBook.getIsAdviserBook() && !esBook.getIsBookAdviserDelete());
bookDto.setFreezeStatus(BooleanUtils.toIntegerObject(findFreezedRecord(esBook.getBookFreezeList()) != null,
BookFreezeEnum.FREEZE.value, null));
BookTypeDto bookTypeDto = MapUtils.getObject(typeCodeMap, bookDto.getTypeCode()); BookTypeDto bookTypeDto = MapUtils.getObject(typeCodeMap, bookDto.getTypeCode());
bookDto.setTypeName(Optional.ofNullable(bookTypeDto).orElseGet(BookTypeDto::new).getTypeName()); bookDto.setTypeName(Optional.ofNullable(bookTypeDto).orElseGet(BookTypeDto::new).getTypeName());
......
...@@ -272,7 +272,8 @@ public class BookFacadeImpl implements BookFacade { ...@@ -272,7 +272,8 @@ public class BookFacadeImpl implements BookFacade {
param.setIsbn(isbn); param.setIsbn(isbn);
param.setSerialNumber(serialNumber); param.setSerialNumber(serialNumber);
param.setIsCurrentMonth(isCurrentMonth); param.setIsCurrentMonth(isCurrentMonth);
param.setCurrentPage(currentPage); // 页面起始为0,故+1
param.setCurrentPage(currentPage + 1);
param.setPageSize(numPerPage); param.setPageSize(numPerPage);
return new ResponseDto<>(bookElasticSearchBiz.getListPage(param)); return new ResponseDto<>(bookElasticSearchBiz.getListPage(param));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment