From eb58d2d4fcc201dbfb31e96c58e680b7da0a846e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 六月 2020 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
index 4bbbb8a..5b4fd29 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
@@ -1147,7 +1147,7 @@
}
@Override
- public void fixedTimeSend(List<GoodsEvaluate> listActivity, List<GoodsEvaluate> listGoods) {
+ public void fixedTimeSend(List<GoodsEvaluate> listActivity, List<GoodsEvaluate> listGoods, boolean timeLimit) {
if (listGoods == null && listActivity == null)
return;
// 涓�涓皬鏃朵箣鍓�
@@ -1166,11 +1166,15 @@
if (cloudManage == null || cloudManage.getOfficial() == null || !cloudManage.getOfficial()) {
continue;
}
- // 鏄惁鍦ㄤ竴涓皬鏃跺唴宸插彂閫佽繃
- UserCloudSendRecord last = userCloudSendRecordService.getLastByUid(uid, lastTime);
- if (last != null)
- continue;
-
+
+ // 鏃堕棿闂撮殧锛氭槸鍚﹀湪涓�涓皬鏃跺唴宸插彂閫佽繃
+ if (timeLimit) {
+ UserCloudSendRecord last = userCloudSendRecordService.getLastByUid(uid, lastTime);
+ if (last != null)
+ continue;
+ }
+
+
String evaluateId = null;
// 娲诲姩
if (listActivity != null && listActivity.size() > 0) {
--
Gitblit v1.8.0