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 |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 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 9303f21..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
@@ -9,16 +9,20 @@
 import com.ks.lucky.pojo.DO.*;
 import com.ks.lucky.pojo.DTO.ActivityAssistFriend;
 import com.ks.lucky.pojo.DTO.ActivityFriendAssistInfo;
+import com.ks.lucky.pojo.DTO.mq.ActivityAssistMsgDTO;
 import com.ks.lucky.query.ActivityJoinAssistQuery;
 import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
 import com.ks.lucky.service.impl.LuckyActivityJoinManager;
 import com.ks.lucky.service.impl.LuckyActivityUserWeightRecordManager;
 import com.ks.lucky.util.factory.LuckyActivityUserWeightRecordFactory;
+import com.ks.lucky.util.mq.CMQManager;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +45,6 @@
     private LuckyActivityMapper luckyActivityMapper;
 
     @Transactional(rollbackFor = Exception.class)
-    @Validated
     @Override
     public void assist(Long activityId, Long appId, String uid, String targetUid, ActivityJoinAssistEvent eventKey, int weight) throws LuckyActivityException, LuckyActivityJoinAssistException {
 
@@ -91,12 +94,53 @@
         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) {
             throw new LuckyActivityJoinAssistException(1, "娣诲姞璁板綍鍑洪敊");
         }
+
+        //鍔╁姏娑堟伅
+        CMQManager.getInstance().publishActivityAssistMsg(new ActivityAssistMsgDTO(activityId, appId, uid, targetUid, true, assist.getCreateTime(),eventKey));
+    }
+
+    @Override
+    public boolean isAssisted(@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;
+        return luckyActivityJoinAssistMapper.count(query) > 0;
+    }
+
+    @Override
+    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);
+        }
     }
 
     @Override

--
Gitblit v1.8.0