refactor(mall): 优化会员信息修改逻辑

KKSU

2025-01-09 cd51c3f662088e8021fb575f1aa5755dc4707efc

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

@@ -388,6 +388,10 @@
        //获取退款订单信息
        Long orderId = apiLeaderRefundOrderDto.getOrderId();
        Long itemId = apiLeaderRefundOrderDto.getItemId();
        Integer agreeType = apiLeaderRefundOrderDto.getAgreeType();
        if(!(1 == agreeType || 2 == agreeType)){
            return new FebsResponse().fail().message("退款失败，请联系客服人员");
        }

        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
@@ -421,13 +425,31 @@
            int orderMoney = orderAmount.multiply(aa).intValue();

            //退款退款金额
//            BigDecimal refundAmount = mallRefundEntity.getAmount();
//            List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
//            if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
//                if(1==mallOrderItemListOnly.size()){
//                    refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
//                    log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
//                }
//            }
            BigDecimal refundAmount = mallRefundEntity.getAmount();
            List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
            List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId);
            if(CollUtil.isEmpty(mallOrderItemListOnly) && CollUtil.isNotEmpty(mallOrderItemListIng) ){
                if(1 == mallOrderItemListIng.size() ){
                    refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
                    log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
            if(agreeType == 1){
                List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
                if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
                    if(1==mallOrderItemListOnly.size()){
                        refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
                        log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
                    }
                }
            }else if(agreeType == 2){
                List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
                List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId);
                if(CollUtil.isEmpty(mallOrderItemListOnly) && CollUtil.isNotEmpty(mallOrderItemListIng) ){
                    if(1 == mallOrderItemListIng.size() ){
                        refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
                        log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
                    }
                }
            }
//            refundAmount = refundAmount.add(mallOrderInfo.getCarriage());