From 6af9629e63e6c15a79627adc114e250d82f3525d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 14 十二月 2019 17:48:22 +0800
Subject: [PATCH] 邀请图缓存 + 订单售后统计
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 9df4f1e..96dfaef 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))
@@ -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)
@@ -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,6 +510,9 @@
}
});
} else if (tokenType == TokenTypeEnum.redPack) {
+ if(!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ throw new TokenRecordException(1, "璇峰崌绾у埌鏈�鏂扮増");
+
try {
msg = "棰嗗彇绾㈠寘鎴愬姛锛岃鍒癧鎴戠殑-绾㈠寘]涓煡鐪�";
// 棰嗗彇绾㈠寘銆佹洿鏂拌褰�
@@ -593,10 +602,18 @@
try {
UserInfo user = userInfoService.selectByPKey(giveUid);
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+
+ String inviteCode = null;
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) {
+ inviteCode = userInfoExtra.getInviteCodeVip();
+ } else {
+ inviteCode = userInfoExtra.getInviteCode();
+ }
+
MsgInviteContentDTO msgInvite = new MsgInviteContentDTO();
msgInvite.setTitle("閭�璇锋秷鎭�");
msgInvite.setState("鎴愬姛婵�娲婚個璇�");
- msgInvite.setCode("浣犵殑閭�璇风爜锛�" + userInfoExtra.getInviteCode());
+ msgInvite.setCode("浣犵殑閭�璇风爜锛�" + inviteCode);
msgInvite.setInviter("鏄电О锛�"+user.getNickName());
msgInvite.setMode("鎴愬姛棰嗗彇閭�璇蜂汉鐨�" + giftName);
userInviteMsgNotificationService.receiveGift(uid, "閭�璇峰叧绯讳竴鏃︾‘绔嬫棤娉曟洿鏀� ", msgInvite);
--
Gitblit v1.8.0