BUG修改

xuhy

2023-05-22 e93c5d64b16a7b3271e81937f1df1b37ff5919cc

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -51,6 +51,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -219,8 +220,8 @@
     * 佣金跳转详情页面
     */
    @RequestMapping("/commission/driverCommissionDetail")
    public String driverCommissionDetail(Integer tDriverId, Model model) {
        tDriverService.driverCommissionDetail(tDriverId,model);
    public String driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model) {
        tDriverService.driverCommissionDetail(tDriverId,levelFlag,model);
        return PREFIX + "tDriverCommissionDetail.html";
    }

@@ -326,13 +327,13 @@
                    driverResp.setNotOnlineCount(0);
                }else {
                    Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(Math.abs(period.getDays()));
                    driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
                }
            }else {
                if(Objects.nonNull(driverResp.getApprovalTime())){
                    // 没有上班记录，计算审核时间
                    Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(Math.abs(period.getDays()));
                    driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
                }else {
                    driverResp.setNotOnlineCount(0);
                }
@@ -348,7 +349,11 @@
    public Object commissionList(String name,String phone,Integer status) {
        EntityWrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
        List<TDriver> tDrivers = tDriverService.selectList(wrapper);
        return tDriverService.getTDriverCommissionResp(tDrivers);
        List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(tDrivers);
        for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
            tDriverCommissionResp.setLevelFlag(0);
        }
        return commissionResp;
    }
    /**
     * 获取异常列表
@@ -360,7 +365,31 @@
        wrapper.eq("isException",2);
        wrapper.orderBy("createTime",false);
        List<TDriver> tDrivers = tDriverService.selectList(wrapper);
        return tDriverService.getTDriverResp(tDrivers);
        List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
        for (TDriverResp driverResp : tDriverResp) {
            TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
                    .eq("driverId", driverResp.getId())
                    .orderBy("workTime", false)
                    .last("LIMIT 1"));
            if(Objects.nonNull(tDriverWork)){
                // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
                if(tDriverWork.getStatus() == 1){
                    driverResp.setNotOnlineCount(0);
                }else {
                    Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
                }
            }else {
                if(Objects.nonNull(driverResp.getApprovalTime())){
                    // 没有上班记录，计算审核时间
                    Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
                }else {
                    driverResp.setNotOnlineCount(0);
                }
            }
        }
        return tDriverResp;
    }

    /**
@@ -368,8 +397,7 @@
     */
    @RequestMapping(value = "/commission/connect/list")
    @ResponseBody
    public Object commissionConnectList(String driverId) {

    public Object commissionConnectList(String driverId,Integer levelFlag) {
        // 查询当前用户的用户信息
        TDriver tDriver = tDriverService.selectById(driverId);

@@ -379,24 +407,30 @@
        }
        wrapper.orderBy("createTime",false);
        List<TDriver> list = tDriverService.selectList(wrapper);
        List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(list);
        for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
            if(Objects.nonNull(tDriver)){
                tDriverCommissionResp.setInviterName(tDriver.getName());
                tDriverCommissionResp.setInviterPhone(tDriver.getPhone());

                if(Objects.nonNull(tDriver.getInviterId())){
                    TDriver driver = tDriverService.selectById(tDriver.getInviterId());
                    if(Objects.nonNull(driver.getInviterId())){
                        tDriverCommissionResp.setLevel("三级");
                    }else {
        List<TDriverCommissionResp> commissionResp = new ArrayList<>();
        try{
            commissionResp = tDriverService.getTDriverCommissionResp(list);
            for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
                if(Objects.nonNull(tDriver)){
                    tDriverCommissionResp.setInviterName(tDriver.getName());
                    tDriverCommissionResp.setInviterPhone(tDriver.getPhone());
                    if(levelFlag == 0){
                        tDriverCommissionResp.setLevelFlag(1);
                        tDriverCommissionResp.setLevel("一级");
                    }
                    if(levelFlag == 1){
                        tDriverCommissionResp.setLevelFlag(2);
                        tDriverCommissionResp.setLevel("二级");
                    }
                }else {
                    tDriverCommissionResp.setLevel("一级");
                }
                    if(levelFlag == 2){
                        tDriverCommissionResp.setLevelFlag(3);
                        tDriverCommissionResp.setLevel("三级");
                    }

                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return commissionResp;
    }
@@ -548,7 +582,8 @@
        tRechargeRecord.setPayTime(new Date());
        tRechargeRecord.setPayStatus(2);
        tRechargeRecord.setCreateTime(new Date());
        tRechargeRecord.setAgentId(Objects.requireNonNull(ShiroKit.getUser()).getId());
        Integer id1 = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
        tRechargeRecord.setAgentId(id1);
        tRechargeRecordService.insert(tRechargeRecord);
        return SUCCESS_TIP;
    }