From 37f89b3118620daa2277e227c2abdb574496ef56 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十二月 2020 16:16:40 +0800
Subject: [PATCH] bug修复
---
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
index dc30fd8..39cefd1 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
@@ -1,6 +1,5 @@
package com.ks.lucky.service.impl.remote;
-import com.ks.app.exception.AppException;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.exception.LuckyActivityException;
import com.ks.lucky.exception.LuckyMQException;
@@ -17,10 +16,11 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
-@Service(version = "1.0")
+@Service(version = "1.0.0")
public class LuckyActivityServiceImpl implements LuckyActivityService {
@Resource
@@ -248,6 +248,11 @@
}
@Override
+ public LuckyActivity getActivity(Long id) {
+ return luckyActivityManager.selectByPrimaryKey(id);
+ }
+
+ @Override
public LuckyActivity getActivityDetail(Long id) {
LuckyActivity activity = luckyActivityMapper.selectByPrimaryKey(id);
if (activity == null) {
@@ -264,9 +269,19 @@
}
activity.setSponsorInfo(sponsorInfo);
+
//鍔犺浇濂栭」淇℃伅
List<LuckyActivityAwards> awardsList = luckyActivityAwardManager.getAwardList(activity.getId());
- activity.setAwardsList(awardsList);
+ List<LuckyActivityAwards> awardsDetailList = new ArrayList<>();
+ if (awardsList != null) {
+ for (LuckyActivityAwards awards : awardsList) {
+ awards = luckyActivityAwardManager.getAwardDetail(awards.getId());
+ if (awards != null) {
+ awardsDetailList.add(awards);
+ }
+ }
+ }
+ activity.setAwardsList(awardsDetailList);
return activity;
}
@@ -294,5 +309,40 @@
luckyActivityMapper.updateByPrimaryKeySelective(activity);
}
+ @Override
+ public List<LuckyActivity> getRecommendActivity(Long appId, String uid, int page, int pageSize) {
+ ActivityDaoQuery query = new ActivityDaoQuery();
+ query.appId = appId;
+ query.start = (page - 1) * pageSize;
+ query.count = pageSize;
+ query.sort = "actual_start_time desc";
+
+ query.stateList = Arrays.asList(new Integer[]{
+ LuckyActivity.STATE_STARTED,
+ LuckyActivity.STATE_FINISH,
+ LuckyActivity.STATE_PRE_OPENED,
+ LuckyActivity.STATE_OPENED,
+ });
+
+
+ return luckyActivityMapper.list(query);
+ }
+
+ @Override
+ public Long getRecommendActivityCount(Long appId, String uid) {
+ ActivityDaoQuery query = new ActivityDaoQuery();
+ query.appId = appId;
+
+ query.stateList = Arrays.asList(new Integer[]{
+ LuckyActivity.STATE_STARTED,
+ LuckyActivity.STATE_FINISH,
+ LuckyActivity.STATE_PRE_OPENED,
+ LuckyActivity.STATE_OPENED,
+ });
+
+
+ return luckyActivityMapper.count(query);
+ }
+
}
--
Gitblit v1.8.0