BUG修改

xuhy

2023-05-18 ad86e0cb28f4301c4935bea43e4ebd824338390e

 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";
    }

@@ -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;
    }
    /**
     * 获取异常列表
@@ -368,8 +373,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 +383,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;
    }