From 8b2191df2f7d94aa299bd43dcbe97c94e5a61bbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 14:53:34 +0800
Subject: [PATCH] RocketMQ的消息整改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
index 9101fa0..dd59cea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -16,6 +16,7 @@
import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO;
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
@@ -48,6 +49,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TokenUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.vo.msg.TokenVO;
@Service
@@ -117,7 +119,7 @@
}
@Override
- public TokenVO discernToken(String token, Long uid) throws TokenRecordException {
+ public TokenVO discernToken(String token, Long uid, AcceptData acceptData) throws TokenRecordException {
// 瑙ｆ瀽鍙ｄ护
String parseToken = TokenUtil.parseToken(token);
if (StringUtil.isNullOrEmpty(parseToken))
@@ -171,7 +173,7 @@
state = true;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佽�呯殑涓�绾ч槦鍛橈紱");
+ tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佷汉鐨勪竴绾ч槦鍛橈紱");
tips.add("鑾疯禒鐨勫厤鍗曞埜锛岄渶瑕佹縺娲诲悗鎵嶈兘浣跨敤锛岃鎯呭弬瑙佸厤鍗曞埜婵�娲昏鍒欙紱");
tips.add("鎴愬姛棰嗗彇鍚庯紝璇峰埌鈥滄垜鐨�-绂忓埄涓績鈥濇煡鐪嬨��");
} else {
@@ -207,7 +209,7 @@
state = true;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佽�呯殑涓�绾ч槦鍛橈紱");
+ tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佷汉鐨勪竴绾ч槦鍛橈紱");
tips.add("鏉挎牀蹇渷濂栧姳鍒革紝鍙敤浜庘�滃凡鍒拌处鈥濈殑杩斿埄璁㈠崟锛屽湪杩斿埄鐨勫熀纭�涓婂啀鑾峰緱涓�瀹氭瘮渚嬬殑杩斿埄锛�");
tips.add("鎴愬姛棰嗗彇鍚庯紝璇峰埌鈥滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅銆�");
} else {
@@ -218,6 +220,10 @@
throw new TokenRecordException(1, "鍙ｄ护宸插け鏁�");
}
} else if (tokenType == TokenTypeEnum.redPack) {
+ if(!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ throw new TokenRecordException(1, "璇峰崌绾у埌鏈�鏂扮増");
+
+
type = 13;
RedPackGiveRecord giveRecord = redPackGiveRecordService.selectByPrimaryKey(Long.parseLong(identify));
if (giveRecord == null)
@@ -238,7 +244,7 @@
state = true;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负澧炲�肩殑涓�绾ч槦鍛橈紱");
+ tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佷汉鐨勪竴绾ч槦鍛橈紱");
tips.add("绾㈠寘鍙彁鐜帮紝鍙喘涔版姌鎵ｅ晢鍝侊紱");
tips.add("鎴愬姛棰嗗彇鍚庯紝璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅銆�");
} else {
@@ -288,7 +294,7 @@
@Override
- public String receiveToken(String token, Long uid) throws TokenRecordException {
+ public String receiveToken(String token, Long uid, AcceptData acceptData) throws TokenRecordException {
if (uid == null || uid <= 0)
throw new TokenRecordException(1, "鐢ㄦ埛鏈櫥褰�");
@@ -504,10 +510,13 @@
}
});
} else if (tokenType == TokenTypeEnum.redPack) {
+ if(!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ throw new TokenRecordException(1, "璇峰崌绾у埌鏈�鏂扮増");
+
try {
msg = "棰嗗彇绾㈠寘鎴愬姛锛岃鍒癧鎴戠殑-绾㈠寘]涓煡鐪�";
// 棰嗗彇绾㈠寘銆佹洿鏂拌褰�
- RedPackGiveRecord giveRecord = redPackGiveRecordService.receiveFriendsGive(uidToken, Long.parseLong(identify));
+ RedPackGiveRecord giveRecord = redPackGiveRecordService.receiveFriendsGive(uid, Long.parseLong(identify));
// 娑堟伅 + 闃熷憳
executor.execute(new Runnable() {
@Override
@@ -534,7 +543,7 @@
dto.setUserInfo("鏄电О锛�" + giveUserName + " ID锛�" + giveUid);
dto.setTime(sd.format(giveRecord.getGiveTime()));
dto.setMoney("楼" + giveRecord.getAmount().setScale(2));
- userMoneyMsgNotificationService.redPackMsg(giveUid, MsgTypeMoneyTypeEnum.redPackReceiveOff, new Gson().toJson(dto), beiZhu);
+ userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackReceiveOff, new Gson().toJson(dto), beiZhu);
// 璧犻�佷汉娑堟伅
String userName = "鏃�";
@@ -542,7 +551,7 @@
if (user != null && !StringUtil.isNullOrEmpty(user.getNickName()))
userName = user.getNickName();
MsgRedPackGiveContentDTO givedto = new MsgRedPackGiveContentDTO();
- givedto.setTitle("绾㈠寘棰嗗彇");
+ givedto.setTitle("绾㈠寘璧犻��");
givedto.setUserInfo("鏄电О锛�" + userName + " ID锛�" + uid);
givedto.setTime(sd.format(new Date()));
givedto.setMoney("楼" + giveRecord.getAmount().setScale(2));
@@ -617,9 +626,35 @@
return;
Date date = new Date();
for (TokenRecord tokenRecord: list) {
+ Integer state = tokenRecord.getState();
+ if (state != null && state == 0)
+ continue;
+
tokenRecord.setState(1);
tokenRecord.setUpdateTime(date);
tokenRecordMapper.updateByPrimaryKeySelective(tokenRecord);
}
}
+
+
+ @Override
+ public void invalidByRedPack(Long id) {
+ if (id == null)
+ return;
+
+ List<String> list = new ArrayList<String>();
+ list.add(TokenTypeEnum.redPack.name());
+ tokenRecordMapper.invalidByTypeAndIdentify(list, id.toString());
+ }
+
+ @Override
+ public void invalidByCoupon(Long id) {
+ if (id == null)
+ return;
+
+ List<String> list = new ArrayList<String>();
+ list.add(TokenTypeEnum.freeCoupon.name());
+ list.add(TokenTypeEnum.rebatePercentCoupon.name());
+ tokenRecordMapper.invalidByTypeAndIdentify(list, id.toString());
+ }
}
--
Gitblit v1.8.0