feat(mall): 团队领袖列表增加在线状态筛选

Administrator

2025-05-23 ba26983a39a4ea64681407026d10b10c4f127b2b

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

@@ -26,6 +26,7 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -420,11 +421,13 @@

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

            //余额支付退款
            if(mallRefundEntity.getType() == 3){
                log.info("余额支付退款");
                //更新订单详情
                mallOrderItem.setState(3);
                mallOrderItemMapper.updateById(mallOrderItem);
@@ -440,7 +443,6 @@
                mallRefundEntity.setState(1);
                mallRefundEntity.setUpdatedTime(DateUtil.date());
                mallRefundMapper.updateById(mallRefundEntity);
                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额退款",2);

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
                if(CollUtil.isEmpty(mallOrderItemList)){
@@ -448,19 +450,38 @@
                    mallOrderRefund.setStatus(6);
                    mallOrderInfoMapper.updateById(mallOrderRefund);
                }
                memberWalletService.add(refundAmount, mallOrderInfo.getMemberId(), "balance");
                if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
                    memberWalletService.add(refundAmount, mallOrderInfo.getMemberId(), "balance");
                    mallMoneyFlowService.addMoneyFlow(
                            mallOrderInfo.getMemberId(),
                            refundAmount,
                            ScoreFlowTypeEnum.REFUND.getValue(),
                            mallOrderInfo.getOrderNo(),
                            FlowTypeEnum.BALANCE.getValue(),
                            StrUtil.format(ScoreFlowTypeEnum.REFUND.getDesc(),refundAmount),
                            2
                    );
                }
                return new FebsResponse().success().message("退款成功");
            }

            Boolean flag = false;
            Boolean debug = xcxProperties.getDebug();
            if (debug) {
                boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
                flag = b;
                if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
                    boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
                    flag = b;
                }else{
                    flag = true;
                }
            } else {
                log.info("开始调用退款接口。。。退款编号为{}", refundNo);
                boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null);
                flag = b;
                if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
                    log.info("开始调用退款接口。。。退款编号为{}", refundNo);
                    boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null);
                    flag = b;
                }else{
                    flag = true;
                }
            }

            if(flag){
@@ -482,7 +503,17 @@
                mallRefundEntity.setState(1);
                mallRefundEntity.setUpdatedTime(DateUtil.date());
                mallRefundMapper.updateById(mallRefundEntity);
                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.WECHAT_REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.WECHAT.getValue(),"微信退款",2);
                if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
                    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)){
@@ -628,4 +659,42 @@
        return new FebsResponse().success().data(apiLeaderInfoVo);
    }

    @Override
    public FebsResponse happyLeaderList() {
        ArrayList<ApiHappyLeaderInfoVo> apiHappyLeaderInfoVos = new ArrayList<>();

        List<MallTeamLeader> mallTeamLeaders = this.baseMapper.selectList(
                new LambdaQueryWrapper<MallTeamLeader>()
                        .select(
                                MallTeamLeader::getId,
                                MallTeamLeader::getName,
                                MallTeamLeader::getPhone,
                                MallTeamLeader::getUniqueCode,
                                MallTeamLeader::getAddressPic,
                                MallTeamLeader::getAddressArea,
                                MallTeamLeader::getDetailAddress,
                                MallTeamLeader::getLongitude,
                                MallTeamLeader::getLatitude)
                        .eq(MallTeamLeader::getState, 1)
                .eq(MallTeamLeader::getOnlineState,1)
        );
        if(CollUtil.isNotEmpty(mallTeamLeaders)){
            for (MallTeamLeader mallTeamLeader : mallTeamLeaders){
                ApiHappyLeaderInfoVo apiHappyLeaderInfoVo = new ApiHappyLeaderInfoVo();
                apiHappyLeaderInfoVo.setId(mallTeamLeader.getId());
                apiHappyLeaderInfoVo.setName(mallTeamLeader.getName());
                apiHappyLeaderInfoVo.setPhone(mallTeamLeader.getPhone());
                apiHappyLeaderInfoVo.setTakeUniqueCode(mallTeamLeader.getUniqueCode());
                apiHappyLeaderInfoVo.setAddressPic(mallTeamLeader.getAddressPic());
                apiHappyLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
                apiHappyLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
                apiHappyLeaderInfoVo.setLongitude(mallTeamLeader.getLongitude());
                apiHappyLeaderInfoVo.setLatitude(mallTeamLeader.getLatitude());
                apiHappyLeaderInfoVos.add(apiHappyLeaderInfoVo);
            }
        }

        return new FebsResponse().success().data(apiHappyLeaderInfoVos);
    }

}