From 3e7debeb2b7e5e77d19bac5edae1334c6c88839c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 07 十二月 2020 14:04:59 +0800
Subject: [PATCH] 天天抽奖接口完善

---
 service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityAwardResultServiceImpl.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityAwardResultServiceImpl.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityAwardResultServiceImpl.java
index ec60125..22bb345 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityAwardResultServiceImpl.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityAwardResultServiceImpl.java
@@ -39,7 +39,7 @@
 
 
     @Override
-    public LuckyActivityAwardResult getResult(Long appId, String uid, Long activityId, Long awardId) {
+    public LuckyActivityAwardResult getResult(Long appId, String uid, Long activityId) {
         if (appId == null) {
             return null;
         }
@@ -48,7 +48,6 @@
         query.appId = appId;
         query.activityId = activityId;
         query.uid = uid;
-        query.awardId = awardId;
         query.start = 0;
         query.count = 1;
 
@@ -98,7 +97,7 @@
     }
 
     @Override
-    public List<Long> getDrawnActivityIdList(Long appId, Long uid, int page, int pageSize) {
+    public List<Long> getDrawnActivityIdList(Long appId, String uid, int page, int pageSize) {
         List<LuckyActivityAwardResult> list = luckyActivityAwardResultMapper.listUserAwardResult(appId, uid, Arrays.asList(new Integer[]{LuckyActivityAwardResult.STATE_NOT_RECIEVE, LuckyActivityAwardResult.STATE_RECIEVED, LuckyActivityAwardResult.STATE_OUT_OF_DATE, LuckyActivityAwardResult.STATE_RECIEVE_FAILED}), Arrays.asList(new Integer[]{LuckyActivity.STATE_OPENED}), (page - 1) * pageSize, pageSize);
         List<Long> activityIdList = new ArrayList<>();
         if (list != null) {
@@ -110,7 +109,7 @@
     }
 
     @Override
-    public long countDrawnActivityIdList(Long appId, Long uid) {
+    public long countDrawnActivityIdList(Long appId, String uid) {
         return luckyActivityAwardResultMapper.countUserAwardResult(appId, uid, Arrays.asList(new Integer[]{LuckyActivityAwardResult.STATE_NOT_RECIEVE, LuckyActivityAwardResult.STATE_RECIEVED, LuckyActivityAwardResult.STATE_OUT_OF_DATE, LuckyActivityAwardResult.STATE_RECIEVE_FAILED}), Arrays.asList(new Integer[]{LuckyActivity.STATE_OPENED}));
     }
 
@@ -147,5 +146,25 @@
         return list.get(0).getUpdateTime() == null ? list.get(0).getCreateTime() : list.get(0).getUpdateTime();
     }
 
+    @Override
+    public List<LuckyActivityAwardResult> getUnRecievedAward(Long appId, String uid, int page, int pageSize) {
+        ActivityAwardResultQuery query = new ActivityAwardResultQuery();
+        query.state = LuckyActivityAwardResult.STATE_NOT_RECIEVE;
+        query.appId = appId;
+        query.uid = uid;
+        query.start = (page - 1) * pageSize;
+        query.count = pageSize;
+        return luckyActivityAwardResultMapper.list(query);
+    }
+
+    @Override
+    public long countUnRecievedAward(Long appId, String uid) {
+        ActivityAwardResultQuery query = new ActivityAwardResultQuery();
+        query.state = LuckyActivityAwardResult.STATE_NOT_RECIEVE;
+        query.appId = appId;
+        query.uid = uid;
+        return luckyActivityAwardResultMapper.count(query);
+    }
+
 
 }

--
Gitblit v1.8.0