|
|
@@ -19,6 +19,7 @@ import com.alipay.api.request.AlipayTradeQueryRequest;
|
|
|
import com.alipay.api.response.AlipayFundTransCommonQueryResponse;
|
|
|
import com.alipay.api.response.AlipayTradeFastpayRefundQueryResponse;
|
|
|
import com.alipay.api.response.AlipayTradeQueryResponse;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.cyksj.common.EnvCommonService;
|
|
|
@@ -2933,9 +2934,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
.orderByDesc(UserDistributeSubWaiting::getLevel).last("limit 1"));
|
|
|
//小于最大奖励级别
|
|
|
if (userDistributeSubWaiting == null || userDistributeSubWaiting.getLevel() < UserDistributeSubRewards.RewardLevel.values().length) {
|
|
|
- List<UserDistributeSubRewards> userDistributeSubRewards = userDistributeSubRewardsMapper.selectList(Wrappers.lambdaQuery(UserDistributeSubRewards.class)
|
|
|
- .gt(userDistributeSubWaiting != null, UserDistributeSubRewards::getLevel, userDistributeSubWaiting.getLevel())
|
|
|
- .orderByAsc(UserDistributeSubRewards::getLevel));
|
|
|
+ LambdaQueryWrapper<UserDistributeSubRewards> wrapper = Wrappers.lambdaQuery(UserDistributeSubRewards.class);
|
|
|
+ if (userDistributeSubWaiting != null) {
|
|
|
+ wrapper.gt(UserDistributeSubRewards::getLevel, userDistributeSubWaiting.getLevel());
|
|
|
+ }
|
|
|
+ List<UserDistributeSubRewards> userDistributeSubRewards = userDistributeSubRewardsMapper.selectList(wrapper.orderByAsc(UserDistributeSubRewards::getLevel));
|
|
|
for (UserDistributeSubRewards userDistributeSubReward : userDistributeSubRewards) {
|
|
|
log.info("当前级别:{}对应的目标金额是{}", userDistributeSubReward.getLevel(), userDistributeSubReward.getTargetAmount().divide(BigDecimal.valueOf(100)));
|
|
|
Integer rewardLevel = userDistributeSubReward.getLevel();
|