Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐少华
midjourney-proxy
Commits
2e28198c
Commit
2e28198c
authored
Dec 30, 2020
by
李传峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:[none] fix取值逻辑
parent
0c80f1c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
BookElasticSearchBizImpl.java
...m/pcloud/book/book/biz/impl/BookElasticSearchBizImpl.java
+6
-5
BookFacadeImpl.java
...java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
+2
-1
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookElasticSearchBizImpl.java
View file @
2e28198c
...
@@ -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
());
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
View file @
2e28198c
...
@@ -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
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment