直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功

KKSU

2023-12-27 c619972c50577bb699be6ee099b5e2741882fabb

 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java

@@ -254,17 +254,20 @@
                        BigDecimal payMoney = new BigDecimal(total_fee).divide(new BigDecimal(100), 2,
                                RoundingMode.HALF_UP);


                        log.info("订单支付状态---status:{}", order.getStatus());
                        if (order != null && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()) {
                            log.debug("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
                            order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                            log.info("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
//                            order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                            order.setStatus(OrderStatusEnum.FINISH.getValue());
                            order.setPayResult(1);
                            order.setPayTime(new Date());
                            order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
                            order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
                            mallOrderInfoMapper.updateById(order);
                            Long memberId = order.getMemberId();
                            MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
                            if(ObjectUtil.isNotEmpty(mallMemberWallet)){

                                log.info("订单支付用户钱包---mallMemberWallet:{},{}", mallMemberWallet.getBalance(),mallMemberWallet.getScore());
                                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(order.getId());
                                if(ObjectUtil.isNotEmpty(mallOrderItemList)){
                                    /**
@@ -288,6 +291,9 @@
                                        BigDecimal multiply = subtractPrice.divide(presentPrice, 2, BigDecimal.ROUND_DOWN).multiply(mallOrderItem.getAmount());
                                        totalScoreAdd = totalScoreAdd.add(multiply);
                                    }


                                    log.info("订单支付加积分---totalScoreAdd:{}", totalScoreAdd);
                                    if(totalScoreAdd.compareTo(BigDecimal.ZERO) <= 0){
                                        return;
                                    }