From 35a0e0c8e70287765a828683f7fdebfb35908559 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 十一月 2019 14:15:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java
index c03afe6..d397ed7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java
@@ -96,7 +96,7 @@
Date nowTime = new Date();
Date firstLoginTime = userInfoExtra.getFirstLoginTime();
int days = DateUtil.daysBetween2(firstLoginTime, nowTime);
- if (days > Constant.RED_PACK_NEW_USER_DAYS)
+ if (days >= Constant.RED_PACK_NEW_USER_DAYS)
return null; // 宸茬粡瓒呭嚭璁剧疆澶╂暟
RedPackWinNewUser redPackWin = redPackWinNewUserDao.getByUid(uid);
@@ -116,7 +116,7 @@
BigDecimal money = null;
if (redPackWin == null) { // 绗竴娆�
- if (days == Constant.RED_PACK_NEW_USER_DAYS) { // 鏈�鍚庝竴澶�
+ if (days == Constant.RED_PACK_NEW_USER_DAYS - 1) { // 鏈�鍚庝竴澶�
money = Constant.RED_PACK_NEW_USER_MONEY;
} else { // 璁＄畻闅忔満濂栧姳
double randomNum = Constant.RED_PACK_NEW_USER_MIN + Math.random() * (Constant.RED_PACK_NEW_USER_MAX - Constant.RED_PACK_NEW_USER_MIN);
@@ -124,7 +124,7 @@
BigDecimal rate = new BigDecimal(randomNum).setScale(2, BigDecimal.ROUND_DOWN);
money = MoneyBigDecimalUtil.mul(Constant.RED_PACK_NEW_USER_MONEY,rate);
}
- } else if (days == Constant.RED_PACK_NEW_USER_DAYS) { // 鏈�鍚庝竴澶�
+ } else if (days == Constant.RED_PACK_NEW_USER_DAYS - 1) { // 鏈�鍚庝竴澶�
money = MoneyBigDecimalUtil.sub(Constant.RED_PACK_NEW_USER_MONEY, redPackWin.getMoney());
} else { // 璁＄畻鍓╀綑闅忔満濂栧姳 10%-25%
double randomNum = 10 + Math.random() * (20 - 10);
@@ -132,8 +132,12 @@
money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.sub(Constant.RED_PACK_NEW_USER_MONEY,redPackWin.getMoney()),rate);
}
- int num = 1;
money = money.setScale(2);
+ // 4銆佸鍔犵孩鍖�
+ redPackBalanceService.addRedPack(uid, money, RedPackDetailFactory.createNewUserReward(uid, days, money));
+
+ // 鎻掑叆棰嗗彇璁板綍
+ int num = 1;
if (redPackWin == null) {
redPackWin = new RedPackWinNewUser();
redPackWin.setNum(1);
@@ -143,16 +147,11 @@
redPackWin.setUpdateTime(nowTime);
} else {
num = redPackWin.getNum() + 1;
- redPackWin = new RedPackWinNewUser();
- redPackWin.setUid(uid.toString());
redPackWin.setNum(num);
redPackWin.setMoney(MoneyBigDecimalUtil.add(money, redPackWin.getMoney()));
redPackWin.setUpdateTime(nowTime);
}
redPackWinNewUserDao.save(redPackWin);
-
- // 4銆佸鍔犵孩鍖�
- redPackBalanceService.addRedPack(uid, money, RedPackDetailFactory.createNewUserReward(uid,num, money));
RedPackWinDetailVO winDetailVO = new RedPackWinDetailVO();
winDetailVO.setTitle("鏂颁汉绾㈠寘");
--
Gitblit v1.8.0