瀏覽代碼

修复金币刚好够用的情况

tianyunperfect 3 年之前
父節點
當前提交
d952c02742
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 0
      bin/push_server.sh
  2. 2 2
      book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

+ 1 - 0
bin/push_server.sh

@@ -10,6 +10,7 @@ scp book-server/target/*.jar ${remote}:${remoteDir}
 ssh -o StrictHostKeyChecking=no ${remote} > /dev/null 2>&1 << eeooff
 
 sh /app/book-server/bin/boot.sh restart
+sh /root/push-remote.sh
 
 exit
 eeooff

+ 2 - 2
book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

@@ -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) {
                         //扣除所有免费