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
e0c1fe1a
Commit
e0c1fe1a
authored
May 19, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
评价去掉追评时间
parent
facee0a0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
46 deletions
+14
-46
EvaluateOrderConfigDTO.java
...ain/java/com/gic/evaluate/dto/EvaluateOrderConfigDTO.java
+2
-18
EvaluateMsgLogApiService.java
...va/com/gic/evaluate/service/EvaluateMsgLogApiService.java
+3
-4
TabEvaluateOrderConfig.java
.../java/com/gic/evaluate/entity/TabEvaluateOrderConfig.java
+2
-18
EvaluateOrderConfigServiceImpl.java
...evaluate/service/impl/EvaluateOrderConfigServiceImpl.java
+2
-2
EvaluateMsgLogApiServiceImpl.java
...uate/service/outer/impl/EvaluateMsgLogApiServiceImpl.java
+0
-0
EvaluateOutApiServiceImpl.java
...valuate/service/outer/impl/EvaluateOutApiServiceImpl.java
+5
-4
No files found.
gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateOrderConfigDTO.java
View file @
e0c1fe1a
...
...
@@ -81,12 +81,12 @@ public class EvaluateOrderConfigDTO implements Serializable {
/**
* 追评提醒 X天
*/
private
Integer
reviewRemind
;
//
private Integer reviewRemind;
/**
* 追评期限
*/
private
Integer
reviewLimitday
;
//
private Integer reviewLimitday;
/**
* 是否支持用户隐藏追评
...
...
@@ -247,14 +247,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
this
.
review
=
review
;
}
public
Integer
getReviewLimitday
()
{
return
reviewLimitday
;
}
public
void
setReviewLimitday
(
Integer
reviewLimitday
)
{
this
.
reviewLimitday
=
reviewLimitday
;
}
public
Integer
getReviewUserHidden
()
{
return
reviewUserHidden
;
}
...
...
@@ -327,14 +319,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
this
.
replyQuick
=
replyQuick
;
}
public
Integer
getReviewRemind
()
{
return
reviewRemind
;
}
public
void
setReviewRemind
(
Integer
reviewRemind
)
{
this
.
reviewRemind
=
reviewRemind
;
}
public
Integer
getShowType
()
{
return
showType
;
}
...
...
gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateMsgLogApiService.java
View file @
e0c1fe1a
package
com
.
gic
.
evaluate
.
service
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.evaluate.dto.EvaluateMsgLogDTO
;
/**
*
...
...
@@ -31,7 +30,7 @@ public interface EvaluateMsgLogApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse
<
Void
>
saveEvaluateMsgLog
(
EvaluateMsgLogDTO
evaluateMsgLogDTO
);
//
ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO);
/**
* 定时器方法,遍历所有商户,调用队列方法
...
...
@@ -41,7 +40,7 @@ public interface EvaluateMsgLogApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse
<
Void
>
timerSendMemberMessage
(
String
param
);
//
ServiceResponse<Void> timerSendMemberMessage(String param);
/**
* 队列方法 发送模板消息
...
...
@@ -52,5 +51,5 @@ public interface EvaluateMsgLogApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse
<
Void
>
queueSendMemberMessage
(
String
enterpriseId
);
//
ServiceResponse<Void> queueSendMemberMessage(String enterpriseId);
}
gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateOrderConfig.java
View file @
e0c1fe1a
...
...
@@ -59,12 +59,12 @@ public class TabEvaluateOrderConfig {
/**
* 追评提醒 X天
*/
private
Integer
reviewRemind
;
//
private Integer reviewRemind;
/**
* 追评期限
*/
private
Integer
reviewLimitday
;
//
private Integer reviewLimitday;
/**
* 是否支持用户隐藏追评
...
...
@@ -196,22 +196,6 @@ public class TabEvaluateOrderConfig {
this
.
review
=
review
;
}
public
Integer
getReviewRemind
()
{
return
reviewRemind
;
}
public
void
setReviewRemind
(
Integer
reviewRemind
)
{
this
.
reviewRemind
=
reviewRemind
;
}
public
Integer
getReviewLimitday
()
{
return
reviewLimitday
;
}
public
void
setReviewLimitday
(
Integer
reviewLimitday
)
{
this
.
reviewLimitday
=
reviewLimitday
;
}
public
Integer
getReviewUserHidden
()
{
return
reviewUserHidden
;
}
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateOrderConfigServiceImpl.java
View file @
e0c1fe1a
...
...
@@ -35,8 +35,8 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
evaluateOrderConfig
.
setEvaluateLimitday
(
30
);
evaluateOrderConfig
.
setDefaultContent
(
"默认好评!"
);
evaluateOrderConfig
.
setReview
(
Constants
.
OPEN
);
evaluateOrderConfig
.
setReviewRemind
(
10
);
evaluateOrderConfig
.
setReviewLimitday
(
90
);
//
evaluateOrderConfig.setReviewRemind(10);
//
evaluateOrderConfig.setReviewLimitday(90);
evaluateOrderConfig
.
setReviewUserHidden
(
Constants
.
OPEN
);
evaluateOrderConfig
.
setReviewTimes
(
1
);
evaluateOrderConfig
.
setCommentModule
(
1
);
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateMsgLogApiServiceImpl.java
View file @
e0c1fe1a
This diff is collapsed.
Click to expand it.
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java
View file @
e0c1fe1a
...
...
@@ -280,9 +280,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
calendar
.
setTime
(
receiptsDate
);
calendar
.
add
(
Calendar
.
DAY_OF_MONTH
,
evaluateOrderConfig
.
getEvaluateLimitday
());
if
(
Constants
.
OPEN
.
equals
(
evaluateOrderConfig
.
getReview
()))
{
calendar
.
add
(
Calendar
.
DAY_OF_MONTH
,
evaluateOrderConfig
.
getReviewLimitday
());
}
//
if (Constants.OPEN.equals(evaluateOrderConfig.getReview())) {
//
calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getReviewLimitday());
//
}
return
DateUtil
.
compareDate
(
new
Date
(),
calendar
.
getTime
());
}
...
...
@@ -353,7 +353,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
}
else
{
// 是否追评超过次数
List
<
TabEvaluateReply
>
replyList
=
this
.
evaluateReplyService
.
listEvaluateReply
(
evaluate
.
getEnterpriseId
(),
evaluate
.
getEvaluateId
(),
Constants
.
OPEN
);
if
(
CollectionUtils
.
isNotEmpty
(
replyList
)
&&
evaluateOrderConfig
.
getReviewTimes
()
<=
this
.
evaluateReplyService
.
countReviewReplyByMember
(
enterpriseId
,
evaluate
.
getEvaluateId
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
replyList
)
&&
evaluateOrderConfig
.
getReviewTimes
()
<=
this
.
evaluateReplyService
.
countReviewReplyByMember
(
enterpriseId
,
evaluate
.
getEvaluateId
()))
{
// 追评超过次数
resultMap
.
put
(
statusQO
.
getOrderId
(),
OrderReplyEnum
.
REPLY_OVER_MAX_TIMES
.
getCode
());
}
else
{
...
...
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