From 74196bcc835d9b76cdd1bc3d85b0dfbe0191fc00 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 31 十二月 2020 19:23:43 +0800
Subject: [PATCH] 活动信息缓存

---
 service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java |   80 ++++++++++++++++++++++++++++++++--------
 1 files changed, 64 insertions(+), 16 deletions(-)

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 2d91fb5..81bbccc 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
@@ -1,13 +1,13 @@
 package com.ks.daylucky.controller.api.client;
 
+import com.ks.daylucky.pojo.DO.ActivityDrawnRecieveNotifyInfo;
 import com.ks.daylucky.pojo.DO.UserInfo;
-import com.ks.daylucky.pojo.VO.AcceptData;
-import com.ks.daylucky.pojo.VO.ActivityAwardVO;
-import com.ks.daylucky.pojo.VO.SimpleUser;
-import com.ks.daylucky.pojo.VO.UserActivityUnRecievedAwardVO;
+import com.ks.daylucky.pojo.VO.*;
+import com.ks.daylucky.service.ActivityDrawnRecieveNotifyInfoService;
 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.ActivityDetailVOFactory;
 import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
 import com.ks.lucky.exception.LuckyActivityAwardException;
 import com.ks.lucky.exception.LuckyActivityAwardResultException;
@@ -35,14 +35,17 @@
 @RequestMapping("api/client/activity/awards")
 public class ActivityAwardsController {
 
-    @Reference(version = "1.0.0")
+    @Reference(version = "1.0.0",check = false)
     private LuckyActivityAwardResultService luckyActivityAwardResultService;
 
-    @Reference(version = "1.0.0")
+    @Reference(version = "1.0.0",check = false)
     private LuckyActivityAwardService luckyActivityAwardService;
 
     @Resource
     private UserInfoService userInfoService;
+
+    @Resource
+    private ActivityDrawnRecieveNotifyInfoService activityDrawnRecieveNotifyInfoService;
 
 
     /**
@@ -120,28 +123,73 @@
     }
 
     /**
-     * 鑾峰彇鏈濂栫殑濂栧姳淇℃伅
+     * 鑾峰彇棰嗗閫氱煡寮规
      *
      * @param acceptData
      * @return
      */
     @ResponseBody
-    @RequestMapping("getUnRecieveAward")
-    public String getUnRecieveAward(AcceptData acceptData) {
-        List<LuckyActivityAwardResult> resultList = luckyActivityAwardResultService.getUnRecievedAward(acceptData.getApp().getId(), acceptData.getUid() + "", 1, 1);
-        if (resultList != null && resultList.size() > 0) {
-            LuckyActivityAwardResult result = resultList.get(0);
+    @RequestMapping("getRecieveAwardNotify")
+    public String getRecieveAwardNotify(AcceptData acceptData, Long activityId) {
+        ActivityDrawnRecieveNotifyInfo info = activityDrawnRecieveNotifyInfoService.getShowNotifyInfo(acceptData.getApp().getId(), acceptData.getUid(), activityId);
+        if (info != null) {
             UserActivityUnRecievedAwardVO vo = new UserActivityUnRecievedAwardVO();
-            LuckyActivityAwards award = luckyActivityAwardService.getAwardDetail(result.getAwardId());
-            vo.setAwardName(award.getAwardName());
-            vo.setAwardId(award.getId());
-            vo.setPicture(award.getAwardPoster());
+            LuckyActivityAwards award = info.getAwards();
+
             vo.setTitle("娲诲姩鏈熷彿锛歂O." + award.getActivityId());
+            vo.setActivityId(activityId);
+            vo.setType(info.getType());
+            vo.setId(info.getId());
+
+            switch (info.getType()) {
+                case ActivityDrawnRecieveNotifyInfo.TYPE_UNRECIEVE:
+                    vo.setDesc("鏈鍙栵紝鍙湪\"鎴戠殑-鍏ㄩ儴鎶藉\"涓煡鐪�");
+                    vo.setAward(ActivityListItemInfoVOFactory.create(award, null));
+                    break;
+                case ActivityDrawnRecieveNotifyInfo.TYPE_OUTDATE:
+                    vo.setDesc("娉細涓鏃ヨ捣7澶╁唴鏈鍙栧鍝侊紝灏嗕細鎶婂搴斿鍝佸師璺��鍥炶禐鍔╁晢锛屽垏璁颁腑濂栧悗鎸夋椂棰嗗彇濂栧搧銆�");
+                    vo.setAward(ActivityListItemInfoVOFactory.create(award, award.getLevel()));
+                    break;
+            }
             return JsonUtil.loadTrueResult(vo);
         }
         return JsonUtil.loadFalseResult("");
     }
 
+
+    /**
+     * 璁剧疆涓閫氱煡寮规宸茶
+     *
+     * @param acceptData
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("setDrawnNotifyRead")
+    public String setDrawnNotifyRead(AcceptData acceptData, String id) {
+
+        ActivityDrawnRecieveNotifyInfo info = activityDrawnRecieveNotifyInfoService.selectByPrimaryKey(id);
+
+        String uid = null;
+        Long appId = null;
+
+        if (info.getAwardResult() != null) {
+            uid = info.getAwardResult().getUid();
+            appId = info.getAwardResult().getAppId();
+        }
+
+        if (uid == null || appId == null) {
+            return JsonUtil.loadFalseResult("淇℃伅鑾峰彇鍑洪敊");
+        }
+
+        if (acceptData.getUid().longValue() != Long.parseLong(uid) || acceptData.getApp().getId().longValue() != appId) {
+            return JsonUtil.loadFalseResult("涓嶆槸鑷繁鐨勪腑濂�");
+        }
+        activityDrawnRecieveNotifyInfoService.setNotifyShown(info.getId());
+        return JsonUtil.loadTrueResult("");
+    }
+
+
     /**
      * 棰嗗彇濂栧搧
      *

--
Gitblit v1.8.0