From c8041ec0544bf122e6819e6bf698997ccbf30aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 15:32:34 +0800
Subject: [PATCH] 小黄条
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 08a2d77..7351ed1 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,7 +16,11 @@
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;
@@ -37,6 +41,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 {
@@ -63,6 +69,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);
@@ -80,7 +89,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);
@@ -207,7 +216,7 @@
// 鏇存柊閲戝竵
userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
- return (userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin()) + totalGoldCoin;
+ return (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin()) + totalGoldCoin;
}
@Override
@@ -240,7 +249,7 @@
// 鏇存柊閲戝竵
userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
- return totalGoldCoin+(userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin());
+ return totalGoldCoin + (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin());
}
@Transactional
@@ -341,6 +350,7 @@
return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);
}
+ @Transactional
@Override
public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException {
if (record == null)
@@ -356,6 +366,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;
}
@@ -376,14 +394,11 @@
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
}
-
@Override
public long getTotalGoldCoinByUid(Long uid) {
return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
}
-
-
-
+
@Async()
@Override
public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {
@@ -455,16 +470,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;
@@ -484,7 +501,7 @@
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鍏冩椂濂栧姳 ");
@@ -494,15 +511,16 @@
}
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);
@@ -541,7 +559,7 @@
MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
msgOther.setTitle("鎺ㄥ箍绾㈠寘");
msgOther.setTotal("鎺ㄥ箍绾㈠寘楼" + tlj.setScale(2));
- msgOther.setNum(goldCoin + "鏋�");
+ msgOther.setNum(addGoldCoin + "鏋�");
msgOther.setSource("宸茶繘鍏ュ埌鍙敤閲戝竵涓�");
msgOther.setExplain("鍘熸帹骞跨孩鍖呭姛鑳戒笅绾匡紝鍓╀綑鎺ㄥ箍绾㈠寘鎸夌収10:1鎶樼畻涓洪噾甯� ");
userOtherMsgNotificationService.taoLiJinExchangeMsg(uid, "鏈姌绠楁湁涓斾粎鏈変竴娆�", msgOther);
--
Gitblit v1.8.0