zoujiajian 3 жил өмнө
parent
commit
bb1e8f4e6f

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

@@ -243,6 +243,7 @@ public class DistributePopularizeController {
 		if (user == null) {
 			throw BusinessRuntimeException.getInstance("请先授权登录");
 		}
+		Boolean isTakeAll = applyMoneyReq.getIsTakeAll();
 		DistributeMoneyApply.Type type = applyMoneyReq.getType();
 		if (type == null) type = DistributeMoneyApply.Type.zfb;
 		if (type == DistributeMoneyApply.Type.zfb) {
@@ -263,12 +264,14 @@ public class DistributePopularizeController {
 			if (StrUtil.isNotBlank(applyMoneyReq.getRemark()) && applyMoneyReq.getRemark().length() > 512) {
 				throw BusinessRuntimeException.getInstance("备注过多");
 			}
+			isTakeAll = true;
+
 		}
 		DistributeMoneyApply distributeMoneyApply = null;
 		if (type == DistributeMoneyApply.Type.pwdRed) {
 			distributeMoneyApply = userDistributeMapper.selectRelationBusiness(userId);
+			isTakeAll = true;
 		}
-		Boolean isTakeAll = applyMoneyReq.getIsTakeAll();
 		BigDecimal userPoints = user.getPoints();
 		DistributePointsExchangeMoney distributePointsExchangeMoney = distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).orderByDesc(DistributePointsExchangeMoney::getPoints).last("limit 1"));
 		BigDecimal minPoints = BigDecimal.valueOf(distributePointsExchangeMoney.getMinPoints());