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 | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 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..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 @@ -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); } @@ -470,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; @@ -499,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鍏冩椂濂栧姳 "); @@ -518,6 +520,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