|
@@ -284,7 +284,7 @@ public class BookServiceImpl implements BookService {
|
|
|
List<Recharge> freeRecharges = getFreeCharges(bookContentVO.getUserId());
|
|
|
int freeCount = getFreeCountFromCharges(freeRecharges);
|
|
|
//免费是否足够
|
|
|
- if (freeCount > book.getPrice()) {
|
|
|
+ if (freeCount >= book.getPrice()) {
|
|
|
//扣除一部分免费的
|
|
|
int left = book.getPrice();
|
|
|
for (Recharge recharge : freeRecharges) {
|
|
@@ -303,7 +303,7 @@ public class BookServiceImpl implements BookService {
|
|
|
checkUpdate(i);
|
|
|
redisUtil.remove(getUserKey(user.getId()));
|
|
|
|
|
|
- } else if (user.getKandian() + freeCount > book.getPrice()) { //免费+充值足够
|
|
|
+ } else if (user.getKandian() + freeCount >= book.getPrice()) { //免费+充值足够
|
|
|
Integer left = user.getKandian() + freeCount;
|
|
|
if (freeCount != 0) {
|
|
|
//扣除所有免费
|