From d0da0aa5e01dd73b7fca8e59ff2664d7e6076802 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 六月 2020 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 fb1737f..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
@@ -354,7 +354,7 @@
if (robotId == null)
throw new UserCloudException(1, "浜戝彂鍗曟満鍣ㄤ汉涓嶅瓨鍦�");
- List<String> list = AitaokerApiUtil.getContract(12793);
+ List<String> list = AitaokerApiUtil.getContract(robotId);
if (list == null || list.size() == 0)
throw new UserCloudException(1, "鏈绱㈠埌瀵瑰簲缇�");
@@ -364,7 +364,7 @@
String result = redisManager.getCommonString(key);
if (!StringUtil.isNullOrEmpty(result)) {
String groupName = null;
- WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(12793, roomId);
+ WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(robotId, roomId);
if (groupDetail != null) {
groupName = groupDetail.getGroupName();
}
@@ -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