From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 1dfdd89..d118e16 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
@@ -18,7 +18,6 @@
 
 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;
@@ -42,6 +41,7 @@
 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
@@ -369,8 +369,8 @@
 		long count = integralTaskRecordMapper.getTotalGoldCoinByUid(record.getUid());
 		if (count >= 200) {// 澶т簬200鍙戦�佹秷鎭�
 			IntegralTaskMQMsg msg = new IntegralTaskMQMsg(record.getUid(), count, new Date());
-			Message message = new Message(MQTopicName.TOPIC_USER.name(), UserTopicTagEnum.integralTaskFinish.name(),
-					new Gson().toJson(msg).getBytes());
+			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.integralTaskFinish,
+					msg);
 			producer.send(message);
 		}
 
@@ -518,6 +518,7 @@
 	 * @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);

--
Gitblit v1.8.0