From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 insertions(+), 11 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 3f99051..d7b26f6 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
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user.integral;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -15,7 +16,12 @@
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;
@@ -36,6 +42,8 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;
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 {
@@ -62,6 +70,9 @@
@Resource
private ConfigService configService;
+ @Resource(name = "producer")
+ private Producer producer;
+
@Override
public Integer getTotalGoldCoin(long uid, Long cid, Integer dateType) {
return integralTaskRecordMapper.getTotalGoldCoin(uid, cid, dateType);
@@ -79,7 +90,7 @@
taskRecord.setCid(cid);
taskRecord.setTaskId(taskId);
taskRecord.setGoldCoin(goldCoin);
- taskRecord.setState(0);
+ taskRecord.setState(IntegralTaskRecord.STATE_WAITING_RECIEVE);
taskRecord.setCreateTime(new Date());
taskRecord.setUpdateTime(new Date());
integralTaskRecordMapper.insertSelective(taskRecord);
@@ -206,7 +217,7 @@
// 鏇存柊閲戝竵
userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
- return (userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin()) + totalGoldCoin;
+ return (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin()) + totalGoldCoin;
}
@Override
@@ -236,16 +247,10 @@
totalGoldCoin += record.getGoldCoin();
}
- Integer goldCoin = userInfoExtra.getGoldCoin();
- if (goldCoin == null)
- goldCoin = 0;
-
- goldCoin = goldCoin + totalGoldCoin;
-
// 鏇存柊閲戝竵
- userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);
+ userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
- return goldCoin;
+ return totalGoldCoin + (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin());
}
@Transactional
@@ -312,7 +317,7 @@
FrequencyEnum frequency = integralTask.getFrequency();
if (frequency == FrequencyEnum.everyday) {
int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
- TimeUtil.getWholeTime(record.getCreateTime().getTime()));
+ TimeUtil.getWholeTime(record.getCreateTime().getTime()), record.getId());
if (num <= 0)
num = 1;
String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
@@ -346,6 +351,7 @@
return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);
}
+ @Transactional
@Override
public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException {
if (record == null)
@@ -361,6 +367,14 @@
if (record.getUpdateTime() == null)
record.setUpdateTime(new 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;
}
@@ -379,6 +393,11 @@
@Override
public List<IntegralTaskRecord> listByUidAndTaskId(Long uid, Long taskId, int page, int count) {
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
+ }
+
+ @Override
+ public long getTotalGoldCoinByUid(Long uid) {
+ return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
}
@Async()
@@ -491,4 +510,57 @@
}
userOtherMsgNotificationService.firstOrderRewardMsg(uid, null, msgOther);
}
+
+ /**
+ * 鎺ㄥ箍绾㈠寘鎶樼畻閲戝竵
+ *
+ * @param uid
+ * @param addGoldCoin
+ * @param tlj
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void taoLiJinExchange(Long uid, Integer addGoldCoin, BigDecimal tlj) {
+ String uniqueKey = "taoLiJinExchange-" + uid.toString();
+ IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);
+ if (detailRecord != null)
+ return;
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
+ if (userInfoExtra == null)
+ return;
+
+ Integer goldCoin = userInfoExtra.getGoldCoin();
+ if (goldCoin == null)
+ goldCoin = 0;
+ goldCoin = goldCoin + addGoldCoin;
+
+ try {
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
+ extra.setGoldCoin(goldCoin);
+ userInfoExtraService.saveUserInfoExtra(extra);
+ } catch (UserInfoExtraException e) {
+ LogHelper.errorDetailInfo(e);
+ return;
+ }
+
+ // 閲戝竵璇︽儏
+ IntegralDetail detail = new IntegralDetail();
+ detail.setTitle("鎺ㄥ箍绾㈠寘涓嬬嚎-绯荤粺鎶樼畻鎴愰噾甯�");
+ detail.setUid(uid);
+ detail.setMoney(addGoldCoin);
+ detail.setUniqueKey(uniqueKey);
+ detail.setCreateTime(new Date());
+ integralDetailService.insertSelective(detail);
+
+ // 娑堟伅
+ MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
+ msgOther.setTitle("鎺ㄥ箍绾㈠寘");
+ msgOther.setTotal("鎺ㄥ箍绾㈠寘楼" + tlj.setScale(2));
+ msgOther.setNum(addGoldCoin + "鏋�");
+ msgOther.setSource("宸茶繘鍏ュ埌鍙敤閲戝竵涓�");
+ msgOther.setExplain("鍘熸帹骞跨孩鍖呭姛鑳戒笅绾匡紝鍓╀綑鎺ㄥ箍绾㈠寘鎸夌収10:1鎶樼畻涓洪噾甯� ");
+ userOtherMsgNotificationService.taoLiJinExchangeMsg(uid, "鏈姌绠楁湁涓斾粎鏈変竴娆�", msgOther);
+ }
}
--
Gitblit v1.8.0