From 48077e8c704216f38939cfbf1702f45d7190801d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 12 十一月 2019 15:26:39 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 c6840f3..9df4f1e 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
@@ -542,7 +542,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 +617,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