Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-22 ecf282fb285fbba74ff129a4be8a129aa0d8ceb1

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

@@ -2,12 +2,16 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.controller.resp.TDriverCommissionResp;
import com.stylefeng.guns.modular.system.controller.resp.TDriverResp;
import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -29,6 +33,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

/**
@@ -81,6 +86,15 @@
            wrapper.between("createTime",startTime,endTime);
        }
        wrapper.orderBy(true,"approvalStatus");
        // 判断是否为代理商或者分公司
        if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 2){
            // 分公司
            wrapper.eq("branchOfficeId",ShiroKit.getUser().getObjectId());
        }
        if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
            // 代理商
            wrapper.eq("agentId",ShiroKit.getUser().getObjectId());
        }
        return wrapper;
    }

@@ -96,8 +110,10 @@
            TDriverResp tDriverResp = new TDriverResp();
            BeanUtils.copyProperties(tDriver,tDriverResp);

            // 设置余额
            tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
            if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){
                // 设置余额
                tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
            }

            // 所属代理商
            TAgent tAgent = tAgentMapper.selectById(tDriver.getAgentId());
@@ -110,11 +126,11 @@
                tDriverResp.setBranchName(tBranchOffice.getPrincipal());
            }
            //累计订单量
            List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
            List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
                    && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
            tDriverResp.setCumulativeOrderCount(cumulativeOrderCount.size());
            //当月订单量
            List<TOrder> monthOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
            List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
                    && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
            && new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
            tDriverResp.setMonthOrderCount(monthOrderCount.size());
@@ -190,18 +206,20 @@
            model.addAttribute("principal","");
        }

        // 查询邀请人
        if(Objects.nonNull(tDriver.getInviterType()) && 1 == tDriver.getInviterType()){
            TAppUser tAppUser = tAppUserMapper.selectById(tDriver.getInviterId());
            model.addAttribute("inviterName",tAppUser.getNickname());
            model.addAttribute("inviterPhone",tAppUser.getPhone());
        }else if(Objects.nonNull(tDriver.getInviterType()) && 2 == tDriver.getInviterType()){
            TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
            model.addAttribute("inviterName",tDriver1.getName());
            model.addAttribute("inviterPhone",tDriver1.getPhone());
        }else {
            model.addAttribute("inviterName","");
            model.addAttribute("inviterPhone","");
        if(Objects.nonNull(tDriver.getInviterId())){
            // 查询邀请人
            if(Objects.nonNull(tDriver.getInviterType()) && 1 == tDriver.getInviterType()){
                TAppUser tAppUser = tAppUserMapper.selectById(tDriver.getInviterId());
                model.addAttribute("inviterName",tAppUser.getNickname());
                model.addAttribute("inviterPhone",tAppUser.getPhone());
            }else if(Objects.nonNull(tDriver.getInviterType()) && 2 == tDriver.getInviterType()){
                TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
                model.addAttribute("inviterName",tDriver1.getName());
                model.addAttribute("inviterPhone",tDriver1.getPhone());
            }else {
                model.addAttribute("inviterName","");
                model.addAttribute("inviterPhone","");
            }
        }

        // 查询当前用户邀请了哪些人
@@ -247,7 +265,7 @@
    }

    @Override
    public void addOrUpdate(TDriver tDriver) {
    public Object addOrUpdate(TDriver tDriver) {
        // 对省市区做处理
        String[] split = tDriver.getAreaId().split("/");
        // 查询省市
@@ -271,36 +289,43 @@
        tDriver.setAreaName(area.getName());
        tDriver.setAreaCode(area.getCode());

        tDriver.setCode(UUIDUtil.getNumberRandom(16));
        tDriver.setBalance(BigDecimal.ZERO);
        tDriver.setBackgroundBalance(BigDecimal.ZERO);

        // 通过省市查询代理商
        List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
                .eq("cityCode", city.getCode())
                .eq("status", StatusEnum.NORMAL.getCode())
                .last("LIMIT 1"));
        if(!CollectionUtils.isEmpty(tAgent)){
            tDriver.setAgentId(tAgent.get(0).getId());
        }else {
            return new SuccessTip(500, "该区域代理商被冻结或不存在");
        }
        // 查询邀约人（司机端）
        List<TDriver> emergencyDriver = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("phone", tDriver.getEmergencyPhone())
                .last("LIMIT 1"));
        if(!CollectionUtils.isEmpty(emergencyDriver)){
            tDriver.setInviterId(emergencyDriver.get(0).getId());
            tDriver.setInviterType(2);
        if(StringUtils.hasLength(tDriver.getInviterPhone())){
            // 查询邀约人（司机端）
            List<TDriver> emergencyDriver = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("phone", tDriver.getInviterPhone())
                    .last("LIMIT 1"));
            if(!CollectionUtils.isEmpty(emergencyDriver)){
                tDriver.setInviterId(emergencyDriver.get(0).getId());
                tDriver.setInviterType(2);
            }else {
                return new SuccessTip(500, "该邀约人:"+tDriver.getInviterName()+"不存在");
            }
        }
        // 通过省市区查询分公司
        List<TBranchOffice> tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
                .eq("cityCode", city.getCode())
                .eq("status", StatusEnum.NORMAL.getCode())
                .eq("districtCode", area.getCode())
                .last("LIMIT 1"));
        if(!CollectionUtils.isEmpty(tBranchOffice)){
            tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());
        }else {
            return new SuccessTip(500, "该区域分公司被冻结或不存在");
        }

        // ocr识别
//        JSONObject ocr = this.ocr("E:\\071bf986db0b00355c0ed190bbd3b16.png");
//        System.err.println(ocr);
        return null;
    }

    @Override
@@ -319,6 +344,118 @@
            wrapper.like("name",name);
        }
        wrapper.orderBy(true,"approvalStatus");
        // 判断是否为代理商或者分公司
        if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 2){
            // 分公司
            wrapper.eq("branchOfficeId",ShiroKit.getUser().getObjectId());
        }
        if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
            // 代理商
            wrapper.eq("agentId",ShiroKit.getUser().getObjectId());
        }
        return wrapper;
    }

    @Override
    public List<TDriverCommissionResp> getTDriverCommissionResp(List<TDriver> drivers) {
        List<TDriverCommissionResp> commissionRespList = new ArrayList<>(drivers.size());
        for (TDriver driver : drivers) {
            TDriverCommissionResp commissionResp = new TDriverCommissionResp();
            BeanUtils.copyProperties(driver,commissionResp);

            // 查询代理商
            // 所属代理商
            TAgent tAgent = tAgentMapper.selectById(driver.getAgentId());
            if(Objects.nonNull(tAgent)){
                commissionResp.setAgentName(tAgent.getPrincipal());
            }

            // 关联人数
            AtomicInteger connectedPersons = new AtomicInteger(0);

            List<TDriver> inviterTwoList = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", driver.getId()));
            if(!CollectionUtils.isEmpty(inviterTwoList)){
                // 推广人数
                commissionResp.setNumberPromoters(inviterTwoList.size());
                List<Integer> inviterTwoIds = inviterTwoList.stream().map(TDriver::getId).collect(Collectors.toList());
                connectedPersons.addAndGet(inviterTwoList.size());
                // 查询三级
                List<TDriver> inviterThreeList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterTwoIds));
                if(!CollectionUtils.isEmpty(inviterThreeList)){
                    List<Integer> inviterThreeIds = inviterThreeList.stream().map(TDriver::getId).collect(Collectors.toList());
                    connectedPersons.addAndGet(inviterThreeList.size());
                    // 查询四级
                    List<TDriver> inviterFourList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterThreeIds));
                    connectedPersons.addAndGet(inviterFourList.size());

                }
            }

            commissionResp.setConnectedPersons(connectedPersons.get());

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

            // 累计佣金  可提现佣金+已提现佣金
            commissionResp.setAccumulatedCommission(BigDecimal.ZERO);

            commissionRespList.add(commissionResp);

        }
        return commissionRespList;
    }

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

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

        // 司机信息封装
        model.addAttribute("driverId",tDriverId);
        model.addAttribute("name",driver.getName());
        model.addAttribute("phone",driver.getPhone());
        model.addAttribute("sex",driver.getSex());
        model.addAttribute("status",driver.getStatus());
        model.addAttribute("commission",driver.getCommission());
        model.addAttribute("startTimeToEndTime",new SimpleDateFormat("yyyy-MM-dd").format(driver.getCreateTime()).replace("-",".")+"-"+
                new SimpleDateFormat("yyyy-MM-dd").format(new Date()).replace("-","."));

        // 所属代理商
        TAgent tAgent = tAgentMapper.selectById(driver.getAgentId());
        if(Objects.nonNull(tAgent)){
            model.addAttribute("agentName",tAgent.getPrincipal());
        }else {
            model.addAttribute("agentName","");
        }

        // 关联人数
        AtomicInteger connectedPersons = new AtomicInteger(0);
        // 推广人数
        List<TDriver> inviterTwoList = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", driver.getId()));
        if(!CollectionUtils.isEmpty(inviterTwoList)){
            model.addAttribute("numberPromoters",inviterTwoList.size());
            List<Integer> inviterTwoIds = inviterTwoList.stream().map(TDriver::getId).collect(Collectors.toList());
            connectedPersons.addAndGet(inviterTwoList.size());
            // 查询三级
            List<TDriver> inviterThreeList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterTwoIds));
            if(!CollectionUtils.isEmpty(inviterThreeList)){
                List<Integer> inviterThreeIds = inviterThreeList.stream().map(TDriver::getId).collect(Collectors.toList());
                connectedPersons.addAndGet(inviterThreeList.size());
                // 查询四级
                List<TDriver> inviterFourList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterThreeIds));
                connectedPersons.addAndGet(inviterFourList.size());
            }
        }else {
            model.addAttribute("numberPromoters",0);
        }
        model.addAttribute("connectedPersons",connectedPersons.get());
        // 已提现佣金  查询该司机的佣金提现记录
        model.addAttribute("withdrawnAmount",BigDecimal.ZERO);
//        commissionResp.setWithdrawnAmount(BigDecimal.ZERO);
        // 累计佣金  可提现佣金+已提现佣金
        model.addAttribute("accumulatedCommission",BigDecimal.ZERO);
//        commissionResp.setAccumulatedCommission(BigDecimal.ZERO);

    }
}