From 8f1b5245c592cd6dc5eb5a73f9a0ceb2a85f2048 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 一月 2021 18:27:35 +0800
Subject: [PATCH] 外网部署参数修改
---
service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityAwardManager.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 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..3245fe9 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,15 +1,23 @@
package com.ks.lucky.service.impl;
+import com.ks.lib.common.exception.ParamsException;
+import com.ks.lucky.dao.LuckyActivityAwardMaterialDao;
import com.ks.lucky.exception.LuckyActivityAwardException;
+import com.ks.lucky.exception.LuckyActivityAwardMaterialException;
import com.ks.lucky.mapper.LuckyActivityAwardsMapper;
import com.ks.lucky.pojo.DO.LuckyActivityAwardMaterial;
import com.ks.lucky.pojo.DO.LuckyActivityAwards;
+import com.ks.lucky.pojo.DTO.ActivityAwardParams;
import com.ks.lucky.query.ActivityAwardQuery;
+import com.ks.lucky.remote.service.LuckyActivityAwardMaterialService;
+import com.ks.lucky.util.annotation.RedisCache;
+import com.ks.lucky.util.annotation.RedisCacheEvict;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.yeshi.utils.StringUtil;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -23,7 +31,10 @@
private LuckyActivityAwardsMapper luckyActivityAwardsMapper;
@Resource
- private LuckyActivityAwardMaterialManager luckyActivityAwardMaterialManager;
+ private LuckyActivityAwardMaterialDao luckyActivityAwardMaterialDao;
+
+ @Resource
+ private LuckyActivityAwardMaterialService luckyActivityAwardMaterialService;
/**
* 娣诲姞濂栭」
@@ -32,10 +43,25 @@
* @throws LuckyActivityAwardException
*/
@Validated
- public void addAward(LuckyActivityAwards award) throws LuckyActivityAwardException {
+ public void addAward(LuckyActivityAwards award) throws LuckyActivityAwardException, LuckyActivityAwardMaterialException, ParamsException {
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, "鍚岀瓑绾х殑濂栭」宸茬粡瀛樺湪");
+ }
+
+ if (award.getMaterial() != null && award.getMaterial().getId() == null) {
+ String id = luckyActivityAwardMaterialService.addAwardMaterial(award.getMaterial());
+ award.getMaterial().setId(id);
+ award.setMaterialId(id);
+ }
+
luckyActivityAwardsMapper.insertSelective(award);
}
@@ -46,7 +72,10 @@
* @param award
* @throws LuckyActivityAwardException
*/
- public void updateAward(LuckyActivityAwards award) throws LuckyActivityAwardException {
+ @RedisCacheEvict(cate = "activity", key = "'activity-detail-'+#activityId")
+ @RedisCacheEvict(cate = "activity-awards", key = "'getAwardList-'+#activityId")
+ @RedisCacheEvict(cate = "activity-awards", key = "'getAwardDetail-'+#award.id")
+ public void updateAward(LuckyActivityAwards award, Long activityId) throws LuckyActivityAwardException {
if (award.getId() == null) {
throw new LuckyActivityAwardException(LuckyActivityAwardException.CODE_PARAMS_NOT_ENOUGH, "鍙傛暟涓嶅畬鏁�");
}
@@ -64,6 +93,7 @@
* @param activityId
* @return
*/
+ @RedisCache(cate = "activity-awards", key = "'getAwardList-'+#activityId", second = 3600)
public List<LuckyActivityAwards> getAwardList(Long activityId) {
ActivityAwardQuery query = new ActivityAwardQuery();
query.activityId = activityId;
@@ -78,14 +108,16 @@
* @param id
* @return
*/
+ @RedisCache(cate = "activity-awards", key = "'getAwardDetail-'+#id", second = 3600)
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);
}
}
+ awards.setActivityAwardParams(ActivityAwardParams.getBean(awards.getAwardParams()));
return awards;
}
@@ -95,13 +127,36 @@
* @param id
*/
- public void deleteAward(Long id) {
+ @RedisCacheEvict(cate = "activity", key = "'activity-detail-'+#activityId")
+ @RedisCacheEvict(cate = "activity-awards", key = "'getAwardList-'+#activityId")
+ @RedisCacheEvict(cate = "activity-awards", key = "'getAwardDetail-'+#id")
+ public void deleteAward(Long id, Long activityId) {
LuckyActivityAwards awards = getAwardDetail(id);
if (awards.getMaterial() != null) {
- luckyActivityAwardMaterialManager.deleteAwardMaterial(awards.getMaterial().getId());
+ luckyActivityAwardMaterialDao.delete(awards.getMaterial().getId());
}
luckyActivityAwardsMapper.deleteByPrimaryKey(id);
}
+ /**
+ * 璁＄畻濂栭」鏀嚭
+ *
+ * @param activityId
+ * @return
+ */
+ public BigDecimal computeAwardsMoney(Long activityId) {
+ BigDecimal money = new BigDecimal(0);
+ List<LuckyActivityAwards> list = getAwardList(activityId);
+ for (LuckyActivityAwards awards : list) {
+ ActivityAwardParams params = ActivityAwardParams.getBean(awards.getAwardParams());
+ if (params.getType() == ActivityAwardParams.ActivityAwardTypeEnum.alipayRedPackage) {
+ money = money.add(params.getRedPackage());
+ }
+ }
+
+ return money;
+ }
+
+
}
--
Gitblit v1.8.0