Merge branch 'master' into pre

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -192,9 +192,9 @@ public class DistributePopularizeController {
 			if (user.getPoints().compareTo(BigDecimal.ZERO) >= 0) {
 				distributePopularizeView.setGotMoney(user.getPoints().divide(points).multiply(money).divide(oneHundred, 2, RoundingMode.HALF_DOWN));
 			}
-			if (user.getPoints().compareTo(BigDecimal.ZERO) >= 0) {
-				distributePopularizeView.setWaitingMoney(waitingPoints.divide(points).multiply(money).divide(oneHundred, 2, RoundingMode.DOWN));
-			}
+            if (waitingPoints != null) {
+                distributePopularizeView.setWaitingMoney(waitingPoints.divide(points).multiply(money).divide(oneHundred, 2, RoundingMode.DOWN));
+            }
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(distributePopularizeView);
 	}

netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -360,6 +361,10 @@ public class UserController {
                 .eq(User::getId, userId)
                 .select(User::getNickname, User::getBalance, User::getGalaxyCoin)
                 .last("limit 1"));
+        if (user != null && user.getBalance() != null) {
+            // 余额单位为分，仅返回可抵扣的整分金额，避免展示四舍五入后超额扣款；不回写数据库。
+            user.setBalance(user.getBalance().setScale(0, RoundingMode.FLOOR));
+        }
         return GatewayResponse.SUCCESS.newBuilder().toResult(user);
     }