From 5405154d6979f1b50ce2d881bb164b1acca80b6d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 一月 2021 18:58:18 +0800
Subject: [PATCH] 修改相关bug
---
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java
index 02d11c8..b15093c 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java
@@ -94,7 +94,7 @@
luckyActivityJoinAssistMapper.insertSelective(assist);
- LuckyActivityUserWeightRecord weightRecord = LuckyActivityUserWeightRecordFactory.createAssist(activityId, appId, uid, eventKey, weight);
+ LuckyActivityUserWeightRecord weightRecord = LuckyActivityUserWeightRecordFactory.createAssist(activityId, appId, targetUid, eventKey, weight);
try {
luckyActivityUserWeightRecordManager.addRecord(weightRecord);
} catch (ParamsException e) {
@@ -102,7 +102,7 @@
}
//鍔╁姏娑堟伅
- CMQManager.getInstance().publishActivityAssistMsg(new ActivityAssistMsgDTO(activityId, appId, uid, targetUid, true, assist.getCreateTime()));
+ CMQManager.getInstance().publishActivityAssistMsg(new ActivityAssistMsgDTO(activityId, appId, uid, targetUid, true, assist.getCreateTime(),eventKey));
}
@Override
@@ -116,18 +116,31 @@
}
@Override
- public LuckyActivityJoinAssist getRecord(@NotNull Long joinId, @NotNull Long appId, @NotEmpty String uid, @NotNull ActivityJoinAssistEvent eventKey) {
- ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
- query.joinId = joinId;
- query.appId = appId;
- query.uid = uid;
- query.eventKey = eventKey;
- query.count = 1;
- List<LuckyActivityJoinAssist> assistList = luckyActivityJoinAssistMapper.list(query);
- if (assistList == null || assistList.size() == 0) {
- return null;
+ public LuckyActivityJoinAssist getRecord(Long joinId, Long activityId, @NotNull Long appId, @NotEmpty String uid, @NotNull ActivityJoinAssistEvent eventKey) {
+ if (joinId != null) {
+ ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
+ query.joinId = joinId;
+ query.appId = appId;
+ query.uid = uid;
+ query.eventKey = eventKey;
+ query.count = 1;
+ List<LuckyActivityJoinAssist> assistList = luckyActivityJoinAssistMapper.list(query);
+ if (assistList == null || assistList.size() == 0) {
+ return null;
+ }
+ return assistList.get(0);
+ } else {
+ ActivityJoinAssistQuery query = new ActivityJoinAssistQuery();
+ query.appId = appId;
+ query.uid = uid;
+ query.eventKey = eventKey;
+ query.count = 1;
+ List<LuckyActivityJoinAssist> assistList = luckyActivityJoinAssistMapper.listByActivityId(query, activityId);
+ if (assistList == null || assistList.size() == 0) {
+ return null;
+ }
+ return assistList.get(0);
}
- return assistList.get(0);
}
@Override
--
Gitblit v1.8.0