fix 邀请渠道金额为空

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -877,7 +877,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                         }
                         UserDistributeSubRewards thisLevel = thisLevelList.get(0);
                         Integer months = thisLevel.getMonths();
-                        BigDecimal subOrderMoney = orderDonMapper.selectSubChannelOrderMoney(wait.getSubUserId(), subRelate.getCreatedTime(), DateUtil.offsetMonth(subRelate.getCreatedTime(), months));
+                        BigDecimal subOrderMoney = Optional.ofNullable(orderDonMapper.selectSubChannelOrderMoney(wait.getSubUserId(), subRelate.getCreatedTime(), DateUtil.offsetMonth(subRelate.getCreatedTime(), months))).orElse(BigDecimal.ZERO);
                         if (subOrderMoney.compareTo(thisLevel.getTargetAmount()) < 0) {
                             subWaitingMapper.update(null, Wrappers.lambdaUpdate(UserDistributeSubWaiting.class)
                                     .set(UserDistributeSubWaiting::getSendStatus, UserDistributeSubWaiting.Status.close)

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2946,8 +2946,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						Integer months = userDistributeSubReward.getMonths();
 						BigDecimal targetAmount = userDistributeSubReward.getTargetAmount();
 						//是否达到目标额
-						BigDecimal subOrderMoney = orderDonMapper.selectSubChannelOrderMoney(subUserId, userDistributeSub.getCreatedTime(), DateUtil.offsetMonth(userDistributeSub.getCreatedTime(), months));
-						if (subOrderMoney != null && subOrderMoney.compareTo(targetAmount) >= 0) {
+						BigDecimal subOrderMoney = Optional.ofNullable(orderDonMapper.selectSubChannelOrderMoney(subUserId, userDistributeSub.getCreatedTime(), DateUtil.offsetMonth(userDistributeSub.getCreatedTime(), months))).orElse(BigDecimal.ZERO);
+						if (subOrderMoney.compareTo(BigDecimal.ZERO) > 0 && subOrderMoney.compareTo(targetAmount) >= 0) {
 							try {
 								UserDistributeSubWaiting waiting = Optional.ofNullable(userDistributeSubWaitingMapper.selectOne(Wrappers.lambdaQuery(UserDistributeSubWaiting.class)
 										.eq(UserDistributeSubWaiting::getUserId, userId)