From d8d576c5220e9d24251b51a59a58271c6e0cb4a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 17 十二月 2020 10:22:34 +0800
Subject: [PATCH] resource修改
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java | 4
service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ConfigKeyEnum.java | 3
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java | 10 +++
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java | 1
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityUserWeightRecordServiceImpl.java | 2
service-daylucky/src/main/java/com/ks/daylucky/util/Constant.java | 3 +
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 110 +++++++++++++++++++++++++++++++-----
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java | 8 +-
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java | 5 +
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java | 2
10 files changed, 120 insertions(+), 28 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
index 3267af9..f0d0a97 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
@@ -31,10 +31,10 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
- @Reference
+ @Reference(version = "1.0")
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
- @Resource
+ @Reference(version = "1.0")
private LuckyActivityJoinService luckyActivityJoinService;
@Resource
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
index 6b55003..c2cc1e7 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
@@ -16,6 +16,7 @@
import com.ks.lucky.remote.service.LuckyActivityAwardService;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -32,10 +33,10 @@
@RequestMapping("api/client/activity/awards")
public class ActivityAwardsController {
- @Resource
+ @Reference(version = "1.0")
private LuckyActivityAwardResultService luckyActivityAwardResultService;
- @Resource
+ @Reference(version = "1.0")
private LuckyActivityAwardService luckyActivityAwardService;
@Resource
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
index a669bf6..0b124cd 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
@@ -1,15 +1,22 @@
package com.ks.daylucky.controller.api.client;
+import com.ks.daylucky.pojo.DO.ActivityScanRecord;
+import com.ks.daylucky.pojo.DO.AppConfig;
+import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.pojo.VO.AcceptData;
import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
-import com.ks.daylucky.service.ActivityService;
-import com.ks.daylucky.service.ActivityTagService;
-import com.ks.daylucky.service.UserInfoService;
+import com.ks.daylucky.pojo.VO.ActivityDetailVO;
+import com.ks.daylucky.pojo.VO.ActivityListItemInfoVO;
+import com.ks.daylucky.service.*;
import com.ks.daylucky.util.Constant;
+import com.ks.daylucky.util.factory.vo.ActivityDetailVOFactory;
+import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
import com.ks.lucky.pojo.DO.LuckyActivity;
+import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import com.ks.lucky.remote.service.LuckyActivityService;
import net.sf.json.JSONObject;
+import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -23,20 +30,20 @@
@RequestMapping("api/client/activity")
public class ActivityController {
- @Resource
+ @Reference(version = "1.0")
private LuckyActivityService luckyActivityService;
- @Resource
- private ActivityTagService activityTagService;
+ @Reference(version = "1.0")
+ private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
@Resource
- private LuckyActivityJoinService luckyActivityJoinService;
-
- @Resource
- private UserInfoService userInfoService;
+ private ActivityScanRecordService activityScanRecordService;
@Resource
private ActivityService activityService;
+
+ @Resource
+ private AppConfigService appConfigService;
/**
@@ -49,11 +56,21 @@
@ResponseBody
@RequestMapping("getActivityDetail")
public String getActivityDetail(AcceptData acceptData, Long activityId) {
- ActivityDetailInfoDTO vo = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 20, false);
- if (vo == null) {
+ ActivityDetailInfoDTO dto = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 20, false);
+ if (dto == null) {
return JsonUtil.loadFalseResult("娲诲姩涓嶅瓨鍦�");
}
+ AppConfig help = appConfigService.getConfigCache(acceptData.getApp().getId(), ConfigKeyEnum.activityDetailHelp, acceptData.getVersion());
+
+ Integer assistCount = null;
+ if (dto.getJoin()) {
+ long count = luckyActivityJoinAssistService.countAssistRecord(activityId, acceptData.getApp().getId(), acceptData.getUid() + "");
+ assistCount = (int) count;
+ }
+
+
+ ActivityDetailVO vo = ActivityDetailVOFactory.create(dto, help != null ? help.getValue() : null, assistCount);
return JsonUtil.loadTrueResult(vo);
}
@@ -77,15 +94,74 @@
activityIds.add(activity.getId());
}
}
- List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
-
-
-
+ List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
JSONObject data = new JSONObject();
- data.put("data", voList);
+ data.put("data", ActivityListItemInfoVOFactory.create(dtoList));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
}
+ /**
+ * 鑾峰彇璧炲姪鍟嗙殑娲诲姩
+ *
+ * @param acceptData
+ * @param page
+ * @return
+ */
+ @RequestMapping("getSponsorActivity")
+ public String getSponsorActivity(AcceptData acceptData, Long sponsorId, int page) {
+
+ List<LuckyActivity> list = luckyActivityService.getActivityList(acceptData.getApp().getId(), sponsorId, getCanShowStateList(), null, page, Constant.CLIENT_ACTIVITY_LIST_PAGE_SIZE);
+ long count = luckyActivityService.countActivity(acceptData.getApp().getId(), sponsorId, getCanShowStateList(), null);
+
+ List<Long> activityIds = new ArrayList<>();
+ if (list != null && list.size() > 0) {
+ for (LuckyActivity activity : list) {
+ activityIds.add(activity.getId());
+ }
+ }
+ List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
+ JSONObject data = new JSONObject();
+ data.put("data", ActivityListItemInfoVOFactory.create(dtoList));
+ data.put("count", count);
+ return JsonUtil.loadTrueResult(data);
+ }
+
+ /**
+ * 鑾峰彇娴忚瓒宠抗
+ *
+ * @param acceptData
+ * @param page
+ * @return
+ */
+ @RequestMapping("getScanActivityRecord")
+ public String getScanActivityRecord(AcceptData acceptData, int page) {
+
+ List<ActivityScanRecord> list = activityScanRecordService.getRecordList(acceptData.getUid(), page, Constant.CLIENT_ACTIVITY_LIST_PAGE_SIZE);
+ long count = activityScanRecordService.countRecord(acceptData.getUid());
+
+ List<Long> activityIds = new ArrayList<>();
+ if (list != null && list.size() > 0) {
+ for (ActivityScanRecord record : list) {
+ activityIds.add(record.getActivityId());
+ }
+ }
+ List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
+ JSONObject data = new JSONObject();
+ data.put("data", ActivityListItemInfoVOFactory.create(dtoList));
+ data.put("count", count);
+ return JsonUtil.loadTrueResult(data);
+ }
+
+
+ private List<Integer> getCanShowStateList() {
+ List<Integer> list = new ArrayList<>();
+ list.add(LuckyActivity.STATE_OPENED);
+ list.add(LuckyActivity.STATE_STARTED);
+ list.add(LuckyActivity.STATE_FINISH);
+ return list;
+ }
+
+
}
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
index 6c9ad96..a47e647 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
@@ -7,12 +7,14 @@
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.UserInfoUtil;
+import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
import com.ks.lucky.exception.LuckyActivityException;
import com.ks.lucky.exception.LuckyActivityJoinException;
import com.ks.lucky.pojo.DTO.*;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import net.sf.json.JSONObject;
+import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -28,10 +30,10 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {
- @Resource
+ @Reference(version = "1.0")
private LuckyActivityJoinService luckyActivityJoinService;
- @Resource
+ @Reference(version = "1.0")
private LuckyActivityAwardResultService luckyActivityAwardResultService;
@Resource
@@ -202,7 +204,7 @@
List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
JSONObject data = new JSONObject();
- data.put("data", JsonUtil.getApiCommonGson().toJson(voList));
+ data.put("data", ActivityListItemInfoVOFactory.create(voList));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java
index 329c157..4702964 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java
@@ -23,7 +23,7 @@
@RequestMapping("api/client/activity/coupon")
public class ActivityLuckyCouponController {
- @Reference
+ @Reference(version = "1.0")
private LuckyActivityUserWeightRecordService luckyActivityUserWeightRecordService;
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ConfigKeyEnum.java b/service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ConfigKeyEnum.java
index 7770a9a..3fa1f9d 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ConfigKeyEnum.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ConfigKeyEnum.java
@@ -3,7 +3,8 @@
public enum ConfigKeyEnum {
newerCourse("newer_course_url", "鏂版墜鏁欑▼"),
- commonQuestion("common_question_url", "甯歌闂");
+ commonQuestion("common_question_url", "甯歌闂"),
+ activityDetailHelp("activity_detail_help_link", "娲诲姩璇︽儏甯姪閾炬帴");
private String key;
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/util/Constant.java b/service-daylucky/src/main/java/com/ks/daylucky/util/Constant.java
index 5c6f8aa..508f153 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/util/Constant.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/util/Constant.java
@@ -2,4 +2,7 @@
public class Constant {
public final static int PAGE_SIZE = 20;
+
+ //娲诲姩鍒楄〃鐨勬暟閲�
+ public final static int CLIENT_ACTIVITY_LIST_PAGE_SIZE = 10;
}
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java
index 736b511..2ae2fb8 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityListItemInfoVOFactory.java
@@ -32,6 +32,16 @@
return vo;
}
+ public static List<ActivityListItemInfoVO> create(List<ActivityDetailInfoDTO> dtoList) {
+ List<ActivityListItemInfoVO> voList = new ArrayList<>();
+ if (dtoList != null) {
+ for (ActivityDetailInfoDTO dto : dtoList) {
+ voList.add(create(dto));
+ }
+ }
+ return voList;
+ }
+
private static ActivityListItemInfoVO.ActivityBean create(LuckyActivity activity) {
ActivityListItemInfoVO.ActivityBean bean = new ActivityListItemInfoVO.ActivityBean();
List<ActivityAwardVO> list = new ArrayList<>();
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 2020461..d116241 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;
diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityUserWeightRecordServiceImpl.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityUserWeightRecordServiceImpl.java
index 838f913..d1c4661 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityUserWeightRecordServiceImpl.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityUserWeightRecordServiceImpl.java
@@ -9,7 +9,7 @@
import javax.annotation.Resource;
import java.util.List;
-@Service(version = "1.0.0")
+@Service(version = "1.0")
public class LuckyActivityUserWeightRecordServiceImpl implements LuckyActivityUserWeightRecordService {
@Resource
--
Gitblit v1.8.0