BUG修改

xuhy

2023-05-18 ad86e0cb28f4301c4935bea43e4ebd824338390e

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java

@@ -184,6 +184,7 @@
        model.addAttribute("areaName",tDriver.getAreaName());
        model.addAttribute("integral",tDriver.getIntegral());
        model.addAttribute("score",tDriver.getScore());
        model.addAttribute("source",tDriver.getSource());
        model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tDriver.getCreateTime()));

        // 计算驾龄
@@ -240,8 +241,16 @@
        // 查询当前用户邀请了哪些人
        List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", tDriver.getId()));
        if(!CollectionUtils.isEmpty(list)){
            List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
                    .eq("type", UserTypeEnum.DRIVER.getCode())
                    .eq("userDriverId", tDriver.getId())
                    .eq("businessType", 11)
                    .eq("state", 2));
            Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
            BigDecimal bigDecimal = BigDecimal.ZERO;
            reduce.ifPresent(bigDecimal::add);
            model.addAttribute("inviterCommission",bigDecimal.add(tDriver.getCommission()));
            model.addAttribute("inviterCount",list.size());
            model.addAttribute("inviterCommission",0);
        }else {
            model.addAttribute("inviterCommission",0);
            model.addAttribute("inviterCount",0);
@@ -438,11 +447,23 @@
            commissionResp.setConnectedPersons(connectedPersons.get());

            // 已提现佣金  查询该司机的佣金提现记录
            commissionResp.setWithdrawnAmount(BigDecimal.ZERO);

            List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
                    .eq("type", UserTypeEnum.DRIVER.getCode())
                    .eq("userDriverId", driver.getId())
                    .eq("businessType", 11)
                    .eq("state", 2));
            BigDecimal bigDecimal = BigDecimal.ZERO;
            if(!CollectionUtils.isEmpty(tCashWithdrawals)){
                Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
                if(reduce.isPresent()){
                    bigDecimal.add(reduce.get());
                    commissionResp.setWithdrawnAmount(bigDecimal);
                }
            }else {
                commissionResp.setWithdrawnAmount(bigDecimal);
            }
            // 累计佣金  可提现佣金+已提现佣金
            commissionResp.setAccumulatedCommission(BigDecimal.ZERO);

            commissionResp.setAccumulatedCommission(bigDecimal.add(commissionResp.getCommission()));
            commissionRespList.add(commissionResp);

        }
@@ -450,11 +471,12 @@
    }

    @Override
    public void driverCommissionDetail(Integer tDriverId, Model model) {
    public void driverCommissionDetail(Integer tDriverId, Integer levelFlag,Model model) {

        // 查询司机
        TDriver driver = tDriverMapper.selectById(tDriverId);

        model.addAttribute("levelFlag",levelFlag);
        // 司机信息封装
        model.addAttribute("driverId",tDriverId);
        model.addAttribute("name",driver.getName());
@@ -494,11 +516,26 @@
            model.addAttribute("numberPromoters",0);
        }
        model.addAttribute("connectedPersons",connectedPersons.get());
        // 已提现佣金  查询该司机的佣金提现记录
        model.addAttribute("withdrawnAmount",BigDecimal.ZERO);
        List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
                .eq("type", UserTypeEnum.DRIVER.getCode())
                .eq("userDriverId", driver.getId())
                .eq("businessType", 11)
                .eq("state", 2));
        BigDecimal bigDecimal = BigDecimal.ZERO;
        if(!CollectionUtils.isEmpty(tCashWithdrawals)){
            Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
            if(reduce.isPresent()){
                bigDecimal.add(reduce.get());
                // 已提现佣金  查询该司机的佣金提现记录
                model.addAttribute("withdrawnAmount",bigDecimal);
            }
        }else {
            // 已提现佣金  查询该司机的佣金提现记录
            model.addAttribute("withdrawnAmount",bigDecimal);
        }
//        commissionResp.setWithdrawnAmount(BigDecimal.ZERO);
        // 累计佣金  可提现佣金+已提现佣金
        model.addAttribute("accumulatedCommission",BigDecimal.ZERO);
        model.addAttribute("accumulatedCommission",bigDecimal.add(driver.getCommission()));
//        commissionResp.setAccumulatedCommission(BigDecimal.ZERO);

    }