From 54402107ca335c2896fc9c61864f6054ad5bfabb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 16 十二月 2019 16:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
index e5fa4b1..64a5c9c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
@@ -134,13 +134,14 @@
throw new RedPackGiveRecordException(1, "浣欓涓嶈冻");
Date nowDate = new Date();
+ Date endTime = DateUtil.plusDayDate(Constant.TOKEN_DAYS, new Date());
// 璧犻�佽褰�
RedPackGiveRecord giveRecord = new RedPackGiveRecord();
giveRecord.setAmount(amount);
giveRecord.setGiveUid(uid);
giveRecord.setState(RedPackGiveRecord.STATE_INIT);
giveRecord.setGiveTime(nowDate);
- giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, new Date()));
+ giveRecord.setEndTime(endTime);
redPackGiveRecordMapper.insertSelective(giveRecord);
// 鍙ｄ护璁板綍
@@ -149,7 +150,7 @@
tokenRecord.setIdentify(giveRecord.getId() + "");
tokenRecord.setType(TokenTypeEnum.redPack);
tokenRecord.setStartTime(nowDate);
- tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, new Date()));
+ tokenRecord.setEndTime(endTime);
tokenRecord.setState(0);
tokenRecordService.insertSelective(tokenRecord);
@@ -178,13 +179,13 @@
msg.setUid(uid);
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.redPackGiftDrawback,
msg);
+ // 寤惰繜涓�鍒嗛挓
+ message.setStartDeliverTime(endTime.getTime() + 1000 * 60);
try {
producer.send(message);
} catch (Exception e) {
throw new RedPackGiveRecordException(1, "绾㈠寘鍒涘缓澶辫触");
}
-
-
return tips;
}
--
Gitblit v1.8.0