|
|
@@ -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);
|
|
|
}
|