refactor(mall): 重构订单退款和资金流水相关逻辑

Administrator

2025-05-15 84adeef86c567bbe290265208b05b8559fc7f4f8

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

@@ -83,14 +83,20 @@
        List<MallTeamLeader> mallTeamLeaderNo = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_NO);
        if(CollUtil.isNotEmpty(mallTeamLeaderNo)){
            mallTeamLeaderAdd = mallTeamLeaderNo.get(0);
        }
        if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
            mallTeamLeaderAdd = MallTeamLeaderConversion.INSTANCE.dtoToEntity(apiApplayLeaderDto);
            mallTeamLeaderAdd.setState(MallTeamLeader.STATE_ING);
            //申请团长默认关闭返利，返利比例为0
            mallTeamLeaderAdd.setProfitSwitch(2);
            mallTeamLeaderAdd.setBonusPercent("0");
            this.baseMapper.updateById(mallTeamLeaderAdd);
            if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
                mallTeamLeaderAdd.setName(apiApplayLeaderDto.getName());
                mallTeamLeaderAdd.setPhone(apiApplayLeaderDto.getPhone());
                mallTeamLeaderAdd.setAddressPic(apiApplayLeaderDto.getAddressPic());
                mallTeamLeaderAdd.setAddressArea(apiApplayLeaderDto.getAddressArea());
                mallTeamLeaderAdd.setDetailAddress(apiApplayLeaderDto.getDetailAddress());
                mallTeamLeaderAdd.setLongitude(apiApplayLeaderDto.getLongitude());
                mallTeamLeaderAdd.setLatitude(apiApplayLeaderDto.getLatitude());
                mallTeamLeaderAdd.setState(MallTeamLeader.STATE_ING);
                //申请团长默认关闭返利，返利比例为0
                mallTeamLeaderAdd.setProfitSwitch(2);
                mallTeamLeaderAdd.setBonusPercent("0");
                this.baseMapper.updateById(mallTeamLeaderAdd);
            }
        }else{
            MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.dtoToEntity(apiApplayLeaderDto);
            mallTeamLeader.setMemberId(memberId);
@@ -383,6 +389,10 @@

        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
        MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
        if(ObjectUtil.isEmpty(mallGoodsSku)){
            return new FebsResponse().fail().message("退款失败，请联系客服人员");
        }
        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, 3);
        if(CollUtil.isEmpty(mallRefundEntities)){
            return new FebsResponse().fail().message("退款失败，请联系客服人员");
@@ -410,6 +420,7 @@

            //退款退款金额
            BigDecimal refundAmount = mallRefundEntity.getAmount();
            refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
            BigDecimal bb = new BigDecimal(100);
            int refundMoney = refundAmount.multiply(bb).intValue();

@@ -423,8 +434,6 @@
                mallGoods.setStock(mallGoods.getStock() + mallOrderItem.getCnt());
                mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
                mallGoodsMapper.updateById(mallGoods);

                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
                mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
                mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
                mallGoodsSkuMapper.updateById(mallGoodsSku);
@@ -432,7 +441,15 @@
                mallRefundEntity.setState(1);
                mallRefundEntity.setUpdatedTime(DateUtil.date());
                mallRefundMapper.updateById(mallRefundEntity);
                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
                mallMoneyFlowService.addMoneyFlow(
                        mallOrderInfo.getMemberId(),
                        refundAmount,
                        ScoreFlowTypeEnum.REFUND.getValue(),
                        mallOrderInfo.getOrderNo(),
                        FlowTypeEnum.BALANCE.getValue(),
                        StrUtil.format(ScoreFlowTypeEnum.REFUND.getDesc(),refundAmount),
                        2
                );

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
                if(CollUtil.isEmpty(mallOrderItemList)){
@@ -465,7 +482,7 @@
                mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
                mallGoodsMapper.updateById(mallGoods);

                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
//                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
                mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
                mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
                mallGoodsSkuMapper.updateById(mallGoodsSku);
@@ -474,7 +491,16 @@
                mallRefundEntity.setState(1);
                mallRefundEntity.setUpdatedTime(DateUtil.date());
                mallRefundMapper.updateById(mallRefundEntity);
                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());

                mallMoneyFlowService.addMoneyFlow(
                        mallOrderInfo.getMemberId(),
                        refundAmount,
                        ScoreFlowTypeEnum.WECHAT_REFUND.getValue(),
                        mallOrderInfo.getOrderNo(),
                        FlowTypeEnum.BALANCE.getValue(),
                        StrUtil.format(ScoreFlowTypeEnum.WECHAT_REFUND.getDesc(),refundAmount),
                        2
                );

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
                if(CollUtil.isEmpty(mallOrderItemList)){