From 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 14:45:20 +0800
Subject: [PATCH] vip 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 71 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
index d7b26f6..500a5d6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
@@ -16,12 +16,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
-import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
-import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.integral.IntegralTaskRecordMapper;
-import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
-import com.yeshi.fanli.dto.mq.user.body.IntegralTaskMQMsg;
import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.integral.IntegralDetail;
@@ -30,6 +26,7 @@
import com.yeshi.fanli.entity.integral.IntegralTaskClass;
import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
@@ -40,10 +37,9 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskClassService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
-import com.yeshi.fanli.util.rocketmq.MQTopicName;
@Service
public class IntegralTaskRecordServiceImpl implements IntegralTaskRecordService {
@@ -83,6 +79,11 @@
return integralTaskRecordMapper.countFinished(uid, cid, dateType);
}
+ @Override
+ public void invalidGoldCoin() {
+ integralTaskRecordMapper.invalidGoldCoin();
+ }
+
@Override
public void finishedTask(long uid, long cid, long taskId, int goldCoin) {
IntegralTaskRecord taskRecord = new IntegralTaskRecord();
@@ -240,7 +241,7 @@
// 宸查鍙�
Integer state = record.getState();
- if (state != null && state == 1)
+ if (state != null && state != 0)
continue;
if (addDetail(uid, record))
@@ -253,7 +254,7 @@
return totalGoldCoin + (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin());
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public boolean addDetail(Long uid, IntegralTaskRecord record) throws IntegralTaskRecordException {
Long uid2 = record.getUid();
if (uid2 == null || uid.longValue() != uid2.longValue())
@@ -351,7 +352,7 @@
return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException {
if (record == null)
@@ -360,21 +361,16 @@
if (record.getCid() == null || record.getTaskId() == null || record.getGoldCoin() == null
|| record.getState() == null || record.getUid() == null)
throw new IntegralTaskRecordException(2, "鏁版嵁涓嶅畬鎴�");
-
+ Date date = new Date();
if (record.getCreateTime() == null)
- record.setCreateTime(new Date());
+ record.setCreateTime(date);
if (record.getUpdateTime() == null)
- record.setUpdateTime(new Date());
+ record.setUpdateTime(date);
+
+ // 璁剧疆鏈夋晥鏈�
+ record.setEndTime(DateUtil.plusDayDate(Constant.GOLD_COIN_VALID_DAYS, date));
integralTaskRecordMapper.insertSelective(record);
- long count = integralTaskRecordMapper.getTotalGoldCoinByUid(record.getUid());
- if (count >= 200) {// 澶т簬200鍙戦�佹秷鎭�
- IntegralTaskMQMsg msg = new IntegralTaskMQMsg(record.getUid(), count, new Date());
- Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.integralTaskFinish,
- msg);
- producer.send(message);
- }
-
return record;
}
@@ -395,10 +391,6 @@
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
}
- @Override
- public long getTotalGoldCoinByUid(Long uid) {
- return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
- }
@Async()
@Override
@@ -406,7 +398,7 @@
if (uid == null || originUid == null)
return;
- String reward = configService.get("first_order_reward_boss");
+ String reward = configService.get(ConfigKeyEnum.firstOrderRewardBoss.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
@@ -418,7 +410,7 @@
if (uid == null || originUid == null)
return;
- String reward = configService.get("first_order_reward_boss_super");
+ String reward = configService.get(ConfigKeyEnum.firstOrderRewardBossSuper.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "浜�", beizu);
@@ -430,7 +422,7 @@
if (uid == null)
return;
- String reward = configService.get("first_share_order_reward");
+ String reward = configService.get(ConfigKeyEnum.firstShareOrderReward.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);
@@ -442,7 +434,7 @@
if (uid == null || originUid == null)
return;
- String reward = configService.get("first_share_order_reward_boss");
+ String reward = configService.get(ConfigKeyEnum.firstShareOrderRewardBoss.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
@@ -471,16 +463,18 @@
if (userInfoExtra == null)
return;
- Integer goldCoin = userInfoExtra.getGoldCoin();
- if (goldCoin == null)
- goldCoin = 0;
- goldCoin = goldCoin + addGoldCoin;
-
+ int totalGoldCoin = 0;
try {
UserInfoExtra extra = new UserInfoExtra();
extra.setId(userInfoExtra.getId());
- extra.setGoldCoin(goldCoin);
+ Integer goldCoin = userInfoExtra.getGoldCoin();
+ if (goldCoin == null) {
+ extra.setGoldCoin(addGoldCoin);
+ } else {
+ extra.setGoldCoin(goldCoin + addGoldCoin);
+ }
userInfoExtraService.saveUserInfoExtra(extra);
+ totalGoldCoin = extra.getGoldCoin();
} catch (UserInfoExtraException e) {
LogHelper.errorDetailInfo(e);
return;
@@ -500,13 +494,16 @@
MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
msgOther.setTitle("閲戝竵濂栧姳");
msgOther.setNum(addGoldCoin + "閲戝竵");
- msgOther.setTotal(goldCoin + "閲戝竵");
+ msgOther.setTotal(totalGoldCoin + "閲戝竵");
if (StringUtil.isNullOrEmpty(level)) {
msgOther.setSource("棣栫瑪鍒嗕韩璁㈠崟锛岀郴缁熷鍔遍噾甯� ");
msgOther.setExplain("棣栫瑪鍒嗕韩璁㈠崟寰楀埌鐨勫閲戜笉瓒�0.01鍏冩椂濂栧姳 ");
} else {
- msgOther.setSource(level + "绾ч槦鍛橀娆′笅鍗曪紝绯荤粺濂栧姳閲戝竵 ");
- msgOther.setExplain("浠呮柊閭�璇烽槦鍛橀涓嬪崟浣犲緱鍒扮殑濂栭噾涓嶈冻0.01鍏冩椂濂栧姳 ");
+ if (level.equalsIgnoreCase("涓�") || level.equalsIgnoreCase("1"))
+ msgOther.setSource("鐩存帴绮変笣棣栨涓嬪崟锛岀郴缁熷鍔遍噾甯� ");
+ else
+ msgOther.setSource("闂存帴绮変笣棣栨涓嬪崟锛岀郴缁熷鍔遍噾甯� ");
+ msgOther.setExplain("浠呮柊閭�璇风矇涓濋涓嬪崟浣犲緱鍒扮殑濂栭噾涓嶈冻0.01鍏冩椂濂栧姳 ");
}
userOtherMsgNotificationService.firstOrderRewardMsg(uid, null, msgOther);
}
--
Gitblit v1.8.0