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/LuckyActivityAwardManager.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityAwardManager.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityAwardManager.java
index a15f83e..73a6d9e 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityAwardManager.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityAwardManager.java
@@ -1,5 +1,6 @@
 package com.ks.lucky.service.impl;
 
+import com.ks.lucky.dao.LuckyActivityAwardMaterialDao;
 import com.ks.lucky.exception.LuckyActivityAwardException;
 import com.ks.lucky.mapper.LuckyActivityAwardsMapper;
 import com.ks.lucky.pojo.DO.LuckyActivityAwardMaterial;
@@ -23,7 +24,7 @@
     private LuckyActivityAwardsMapper luckyActivityAwardsMapper;
 
     @Resource
-    private LuckyActivityAwardMaterialManager luckyActivityAwardMaterialManager;
+    private LuckyActivityAwardMaterialDao luckyActivityAwardMaterialDao;
 
     /**
      * 娣诲姞濂栭」
@@ -36,6 +37,15 @@
         if (award.getCreateTime() == null) {
             award.setCreateTime(new Date());
         }
+        ActivityAwardQuery query = new ActivityAwardQuery();
+        query.activityId = award.getActivityId();
+        query.level = award.getLevel();
+        query.count=1;
+        List<LuckyActivityAwards> list = luckyActivityAwardsMapper.list(query);
+        if (list != null && list.size() > 0) {
+            throw new LuckyActivityAwardException(LuckyActivityAwardException.CODE_EXIST, "鍚岀瓑绾х殑濂栭」宸茬粡瀛樺湪");
+        }
+
         luckyActivityAwardsMapper.insertSelective(award);
     }
 
@@ -81,7 +91,7 @@
     public LuckyActivityAwards getAwardDetail(Long id) {
         LuckyActivityAwards awards = luckyActivityAwardsMapper.selectByPrimaryKey(id);
         if (!StringUtil.isNullOrEmpty(awards.getMaterialId())) {
-            LuckyActivityAwardMaterial material = luckyActivityAwardMaterialManager.getAwardMaterialDetail(awards.getMaterialId());
+            LuckyActivityAwardMaterial material = luckyActivityAwardMaterialDao.get(awards.getMaterialId());
             if (material != null) {
                 awards.setMaterial(material);
             }
@@ -98,7 +108,7 @@
     public void deleteAward(Long id) {
         LuckyActivityAwards awards = getAwardDetail(id);
         if (awards.getMaterial() != null) {
-            luckyActivityAwardMaterialManager.deleteAwardMaterial(awards.getMaterial().getId());
+            luckyActivityAwardMaterialDao.delete(awards.getMaterial().getId());
         }
         luckyActivityAwardsMapper.deleteByPrimaryKey(id);
     }

--
Gitblit v1.8.0