Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-evaluate
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
base_platform_enterprise
gic-evaluate
Commits
424e0558
Commit
424e0558
authored
Feb 11, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加查询第一条的接口
parent
87874ab9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
8 deletions
+64
-8
EvaluateOutApiService.java
.../java/com/gic/evaluate/service/EvaluateOutApiService.java
+14
-1
EvaluateService.java
...c/main/java/com/gic/evaluate/service/EvaluateService.java
+1
-1
EvaluateServiceImpl.java
...va/com/gic/evaluate/service/impl/EvaluateServiceImpl.java
+1
-1
EvaluateOutApiServiceImpl.java
...valuate/service/outer/impl/EvaluateOutApiServiceImpl.java
+48
-5
No files found.
gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOutApiService.java
View file @
424e0558
package
com
.
gic
.
evaluate
.
service
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.evaluate.dto.EvaluateDTO
;
import
com.gic.evaluate.dto.MemberReplyDTO
;
...
...
@@ -47,7 +48,19 @@ public interface EvaluateOutApiService {
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.evaluate.dto.EvaluateDTO>>
* @throws
*/
ServiceResponse
<
List
<
EvaluateDTO
>>
listEvaluateByStore
(
EvaluateOutQO
evaluateOutQO
);
ServiceResponse
<
List
<
EvaluateDTO
>>
listEvaluateByStore
(
Integer
enterpriseId
,
Integer
storeId
);
/**
* 查询第一条评价
* @Title: getFirstEvaluateByStore
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.evaluate.dto.EvaluateDTO>>
* @throws
*/
ServiceResponse
<
Page
<
EvaluateDTO
>>
getFirstEvaluateByStore
(
Integer
enterpriseId
,
Integer
storeId
);
/**
* 查询会员提的所有评价(包含 展示和未展示)
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateService.java
View file @
424e0558
...
...
@@ -21,7 +21,7 @@ import java.util.Set;
public
interface
EvaluateService
{
Page
<
TabEvaluate
>
listEvaluate
(
EvaluateQO
evaluateQO
);
List
<
TabEvaluate
>
listEvaluateNearByStore
(
EvaluateQO
evaluateQO
);
Page
<
TabEvaluate
>
listEvaluateNearByStore
(
EvaluateQO
evaluateQO
);
Integer
countEvaluate
(
EvaluateQO
evaluateQO
);
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java
View file @
424e0558
...
...
@@ -52,7 +52,7 @@ public class EvaluateServiceImpl implements EvaluateService {
}
@Override
public
List
<
TabEvaluate
>
listEvaluateNearByStore
(
EvaluateQO
evaluateQO
)
{
public
Page
<
TabEvaluate
>
listEvaluateNearByStore
(
EvaluateQO
evaluateQO
)
{
PageHelper
.
startPage
(
1
,
Integer
.
MAX_VALUE
);
// 按附近门店排序
evaluateQO
.
setOrderByField
(
3
);
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java
View file @
424e0558
package
com
.
gic
.
evaluate
.
service
.
outer
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.DateUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.PageHelperUtils
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.response.EnterpriseServiceResponse
;
import
com.gic.evaluate.constant.Constants
;
...
...
@@ -225,11 +227,11 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
}
@Override
public
ServiceResponse
<
List
<
EvaluateDTO
>>
listEvaluateByStore
(
EvaluateOutQO
evaluateOutQO
)
{
public
ServiceResponse
<
List
<
EvaluateDTO
>>
listEvaluateByStore
(
Integer
enterpriseId
,
Integer
storeId
)
{
EvaluateQO
evaluateQO
=
new
EvaluateQO
();
evaluateQO
.
setEnterpriseId
(
e
valuateOutQO
.
getEnterpriseId
()
);
evaluateQO
.
setEnterpriseId
(
e
nterpriseId
);
// evaluateQO.setMemberId(evaluateOutQO.getMemberId());
evaluateQO
.
setStoreIdList
(
Collections
.
singletonList
(
evaluateOutQO
.
getStoreId
()
));
evaluateQO
.
setStoreIdList
(
Collections
.
singletonList
(
storeId
));
evaluateQO
.
setShowStatus
(
Constants
.
OPEN
);
evaluateQO
.
setMaliciousStatus
(
Constants
.
CLOSE
);
// 查询置顶的
...
...
@@ -250,7 +252,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
List
<
TabEvaluateImg
>
evaluateImgList
=
evaluateImgService
.
listImageByEvaluateId
(
evaluateDTO
.
getEvaluateId
());
List
<
String
>
imgList
=
Optional
.
ofNullable
(
evaluateImgList
).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
TabEvaluateImg:
:
getImgUrl
).
collect
(
Collectors
.
toList
());
evaluateDTO
.
setImgList
(
imgList
);
// 追评和回复
/*
// 追评和回复
List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
// 追评和回复的图片
...
...
@@ -259,12 +261,53 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
replyDTO.setImgList(replyImgList);
}
evaluateDTO
.
setReplyList
(
replyDTOList
);
evaluateDTO.setReplyList(replyDTOList);
*/
}
return
EnterpriseServiceResponse
.
success
(
resultList
);
}
@Override
public
ServiceResponse
<
Page
<
EvaluateDTO
>>
getFirstEvaluateByStore
(
Integer
enterpriseId
,
Integer
storeId
)
{
EvaluateQO
evaluateQO
=
new
EvaluateQO
();
evaluateQO
.
setEnterpriseId
(
enterpriseId
);
// evaluateQO.setMemberId(evaluateOutQO.getMemberId());
evaluateQO
.
setStoreIdList
(
Collections
.
singletonList
(
storeId
));
evaluateQO
.
setShowStatus
(
Constants
.
OPEN
);
evaluateQO
.
setMaliciousStatus
(
Constants
.
CLOSE
);
// 查询置顶的
com
.
github
.
pagehelper
.
Page
<
TabEvaluate
>
topHotEvaluate
=
evaluateService
.
listEvaluateNearByStore
(
evaluateQO
);
if
(
CollectionUtils
.
isEmpty
(
topHotEvaluate
))
{
topHotEvaluate
=
new
com
.
github
.
pagehelper
.
Page
<>();
}
else
{
for
(
int
i
=
topHotEvaluate
.
size
()
-
1
;
i
>=
1
;
i
--)
{
topHotEvaluate
.
remove
(
i
);
}
}
Page
<
EvaluateDTO
>
resultPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
topHotEvaluate
,
EvaluateDTO
.
class
);
List
<
EvaluateDTO
>
resultList
=
resultPage
.
getResult
();
for
(
EvaluateDTO
evaluateDTO
:
resultList
)
{
List
<
TabEvaluateImg
>
evaluateImgList
=
evaluateImgService
.
listImageByEvaluateId
(
evaluateDTO
.
getEvaluateId
());
List
<
String
>
imgList
=
Optional
.
ofNullable
(
evaluateImgList
).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
TabEvaluateImg:
:
getImgUrl
).
collect
(
Collectors
.
toList
());
evaluateDTO
.
setImgList
(
imgList
);
/* // 追评和回复
List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
// 追评和回复的图片
for (EvaluateReplyDTO replyDTO : replyDTOList) {
List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
replyDTO.setImgList(replyImgList);
}
evaluateDTO.setReplyList(replyDTOList);*/
}
return
EnterpriseServiceResponse
.
success
(
resultPage
);
}
private
boolean
overLimitTime
(
TabEvaluateOrderConfig
evaluateOrderConfig
,
Date
receiptsDate
)
{
GregorianCalendar
calendar
=
new
GregorianCalendar
();
...
...
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