From d587e55bae358002155b74b28f27b7d216a3e988 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 18 十二月 2019 09:53:31 +0800
Subject: [PATCH] 统计
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 94a2812..997c22c 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
@@ -220,7 +220,7 @@
throw new TokenRecordException(1, "鍙ｄ护宸插け鏁�");
}
} else if (tokenType == TokenTypeEnum.redPack) {
- if(!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
+ if(!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
throw new TokenRecordException(1, "璇峰崌绾у埌鏈�鏂扮増");
@@ -510,7 +510,7 @@
}
});
} else if (tokenType == TokenTypeEnum.redPack) {
- if(!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
+ if(!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
throw new TokenRecordException(1, "璇峰崌绾у埌鏈�鏂扮増");
try {
@@ -602,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);
@@ -626,10 +634,6 @@
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);
--
Gitblit v1.8.0