From ff076ec18ccc61d9d03863d859000e4a46c19a76 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 十二月 2019 11:20:35 +0800
Subject: [PATCH] 自购返利维权到账修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 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..ba9418b 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;
@@ -253,7 +252,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 +350,7 @@
 		return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException {
 		if (record == null)
@@ -370,8 +369,7 @@
 		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);
+			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.integralTaskFinish, msg);
 			producer.send(message);
 		}
 
@@ -471,16 +469,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 +500,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