fix
This commit is contained in:
@@ -296,9 +296,8 @@ public class DailyCheckInServiceImpl extends ServiceImpl<DailyCheckInDao, DailyC
|
||||
if (!winUser.isEmpty()) {
|
||||
//计算获得的金额
|
||||
//BigDecimal divide = dailyCheckIn.getTotalPrice().divide(BigDecimal.valueOf(winUser.size()), 2, RoundingMode.HALF_UP);
|
||||
BigDecimal divide = dailyCheckIn.getJoinPrice();
|
||||
//打卡成功的用户处理
|
||||
BigDecimal surplus = dailyCheckIn.getTotalPrice().subtract(dailyCheckIn.getJoinPrice().multiply(new BigDecimal(winUser.size())));
|
||||
BigDecimal surplus = dailyCheckIn.getTotalPrice().add(dailyCheckIn.getJoinPrice().multiply(new BigDecimal(loserUser.size())));
|
||||
List<BigDecimal> carveList = null;
|
||||
if (surplus.compareTo(BigDecimal.ZERO) > 0) {
|
||||
//最低可瓜分金额
|
||||
@@ -313,6 +312,7 @@ public class DailyCheckInServiceImpl extends ServiceImpl<DailyCheckInDao, DailyC
|
||||
}
|
||||
int index = 0;
|
||||
for (UserDailyCheckIn checkIn : winUser) {
|
||||
BigDecimal divide = dailyCheckIn.getJoinPrice();
|
||||
//计算奖金
|
||||
if (CollUtil.isNotEmpty(carveList) && index < carveList.size()) {
|
||||
divide = divide.add(carveList.get(index));
|
||||
@@ -336,7 +336,7 @@ public class DailyCheckInServiceImpl extends ServiceImpl<DailyCheckInDao, DailyC
|
||||
userBalanceRecord.setLinkType(BalanceRecordConstants.BALANCE_RECORD_LINK_TYPE_ACTIVE_ORDER);
|
||||
userBalanceRecord.setType(BalanceRecordConstants.BALANCE_RECORD_TYPE_ADD);
|
||||
userBalanceRecord.setAmount(divide);
|
||||
userBalanceRecord.setBalance(userInfo.getNowMoney().subtract(divide));
|
||||
userBalanceRecord.setBalance(userInfo.getNowMoney().add(divide));
|
||||
userBalanceRecord.setRemark(StrUtil.format("用户天天打卡分红成功,加余额{}元", divide));
|
||||
userBalanceRecordService.save(userBalanceRecord);
|
||||
}
|
||||
@@ -547,6 +547,24 @@ public class DailyCheckInServiceImpl extends ServiceImpl<DailyCheckInDao, DailyC
|
||||
return arrMoney;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
BigDecimal surplus = new BigDecimal("500.06").subtract(new BigDecimal("0.01").multiply(new BigDecimal(2)));
|
||||
System.out.println(surplus);
|
||||
BigDecimal share = surplus.divide(new BigDecimal(0.02), 2, BigDecimal.ROUND_DOWN);
|
||||
System.out.println(share);
|
||||
List<BigDecimal> list = carveUp(surplus,2);
|
||||
System.out.println(list);
|
||||
|
||||
BigDecimal divide = new BigDecimal("0.01");
|
||||
//计算奖金
|
||||
Integer index = 0;
|
||||
if (CollUtil.isNotEmpty(list) && index < list.size()) {
|
||||
divide = divide.add(list.get(0));
|
||||
index++;
|
||||
}
|
||||
System.out.println(divide);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user