From 478e6722fd36bf9b5d8608c8cca2000190da5496 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十二月 2020 19:16:15 +0800
Subject: [PATCH] 功能完善

---
 service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityJoinAssistServiceImpl.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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 3cc2424..044abab 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
@@ -6,13 +6,11 @@
 import com.ks.lucky.mapper.LuckyActivityJoinAssistMapper;
 import com.ks.lucky.mapper.LuckyActivityJoinRecordMapper;
 import com.ks.lucky.mapper.LuckyActivityMapper;
-import com.ks.lucky.pojo.DO.LuckyActivity;
-import com.ks.lucky.pojo.DO.LuckyActivityJoinAssist;
-import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
-import com.ks.lucky.pojo.DO.LuckyActivityUserWeightRecord;
+import com.ks.lucky.pojo.DO.*;
 import com.ks.lucky.pojo.DTO.ActivityAssistFriend;
 import com.ks.lucky.pojo.DTO.ActivityFriendAssistInfo;
 import com.ks.lucky.query.ActivityJoinAssistQuery;
+import com.ks.lucky.query.ActivityJoinRecordQuery;
 import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
 import com.ks.lucky.service.impl.LuckyActivityJoinManager;
 import com.ks.lucky.service.impl.LuckyActivityUserWeightRecordManager;
@@ -22,10 +20,12 @@
 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;
 
-@Service(version = "1.0")
+@Service(version = "1.0.0")
 public class LuckyActivityJoinAssistServiceImpl implements LuckyActivityJoinAssistService {
 
     @Resource
@@ -46,7 +46,7 @@
     @Transactional(rollbackFor = Exception.class)
     @Validated
     @Override
-    public void assist(Long activityId, Long appId, String uid, String targetUid, LuckyActivityJoinAssist.ActivityJoinAssistEvent eventKey, int weight) throws LuckyActivityException, LuckyActivityJoinAssistException {
+    public void assist(Long activityId, Long appId, String uid, String targetUid, ActivityJoinAssistEvent eventKey, int weight) throws LuckyActivityException, LuckyActivityJoinAssistException {
 
         if (uid.equalsIgnoreCase(targetUid)) {
             throw new LuckyActivityJoinAssistException(1, "涓嶈兘涓鸿嚜宸卞姪鍔�");
@@ -103,6 +103,16 @@
     }
 
     @Override
+    public boolean isAssisted(@NotNull Long joinId, @NotEmpty 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 List<LuckyActivityJoinAssist> getAssistRecordList(Long activityId, Long appId, String uid, int page, int pageSize) {
         LuckyActivityJoinRecord record = luckyActivityJoinManager.getRecord(activityId, appId, uid);
         if (record == null) {

--
Gitblit v1.8.0