From a3ead770c30b310b9b1b7e3786d5d847da540e55 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:21:20 +0800
Subject: [PATCH] 2.0.6
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 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 a888c8f..7d23465 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,11 +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.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;
@@ -39,10 +36,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 {
@@ -82,6 +78,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();
@@ -239,7 +240,7 @@
// 宸查鍙�
Integer state = record.getState();
- if (state != null && state == 1)
+ if (state != null && state != 0)
continue;
if (addDetail(uid, record))
@@ -359,20 +360,24 @@
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);
- }
+
+// 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;
}
@@ -394,10 +399,6 @@
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
}
- @Override
- public long getTotalGoldCoinByUid(Long uid) {
- return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
- }
@Async()
@Override
--
Gitblit v1.8.0