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

KKSU

2023-12-27 f631cafd2f90f1db543d688c1d4c11137a899d23

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

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java

@@ -168,32 +168,6 @@
                }else{
                    totalCarriage = total;
                }
                //减少用户积分和余额
//                BigDecimal avaAmount = totalCarriage;//剩余需要折扣的金额
//                if(avaAmount.compareTo(memberAmount) >= 0){
//                    //清零用户的积分和余额
//                    mallMemberWallet.setBalance(BigDecimal.ZERO);
//                    mallMemberWallet.setScore(BigDecimal.ZERO);
//                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
//                }else{
//                    /**
//                     * 先扣积分，再扣余额
//                     */
//                    if(avaAmount.compareTo(score) >= 0){
//                        mallMemberWallet.setScore(BigDecimal.ZERO);
//                        avaAmount = avaAmount.subtract(score);
//                    }else{
//                        mallMemberWallet.setScore(score.subtract(avaAmount));
//                        avaAmount = BigDecimal.ZERO;
//                    }
//                    //积分不够
//                    if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
//                        mallMemberWallet.setBalance(balance.subtract(avaAmount));
//                    }else{
//                        mallMemberWallet.setBalance(balance);
//                    }
//                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
//                }
            }
            orderInfo.setCarriage(totalCarriage);
        }
@@ -319,10 +293,10 @@
        if(ObjectUtil.isNotEmpty(apiGetOrderListVo)){
            apiGetOrderListVo.setItems(mallOrderItemMapper.getAppOrderItemByOrderId(apiGetOrderListVo.getId()));
        }
        mallOrderInfoMapper.deleteById(orderId);
        QueryWrapper<MallOrderItem> mallOrderItemQuery = new QueryWrapper<>();
        mallOrderItemQuery.eq("order_id",orderId);
        mallOrderItemMapper.delete(mallOrderItemQuery);
//        mallOrderInfoMapper.deleteById(orderId);
//        QueryWrapper<MallOrderItem> mallOrderItemQuery = new QueryWrapper<>();
//        mallOrderItemQuery.eq("order_id",orderId);
//        mallOrderItemMapper.delete(mallOrderItemQuery);
        return new FebsResponse().success().data(apiGetOrderListVo);
    }