开发新增加功能

Pu Zhibing

2025-02-08 0ecd24b3b8101c4717adc2775bbb498261253948

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

@@ -11,14 +11,13 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.WoUtil;
import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.*;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -80,6 +79,9 @@

    @Value("${spring.mail.template-path}")
    private String templatePath;
    
    @Autowired
    private RedisUtil redisUtil;



@@ -106,7 +108,8 @@
     */
    @RequestMapping("/tDriver_add")
    public String tDriverAdd(Model model) {
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
                .eq("state", 0).ne("flag", 3));
        model.addAttribute("companyList",companyList);

        Integer roleType = ShiroKit.getUser().getRoleType();
@@ -185,17 +188,17 @@
        model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());

        if (1 == roleType){
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            model.addAttribute("companyList",companyList);
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()).eq("state", 0).ne("flag", 3));
            model.addAttribute("franchiseeList",franchiseeList);
        }else if (2 == roleType){
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
            model.addAttribute("franchiseeList",franchiseeList);
        }

        //查询平台ID
        TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
        TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).eq("state", 0).ne("flag", 3));
        //判断是平台司机还是加盟司机
        if ((SinataUtil.isEmpty(tDriver.getCompanyId()) || tDriver.getCompanyId() == 0 || tDriver.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tDriver.getFranchiseeId()) || tDriver.getFranchiseeId() == 0)){
            model.addAttribute("companyType",1);
@@ -589,7 +592,6 @@
                type = 6;
                tDriver.setAuthState(4);
            }

            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -608,15 +610,16 @@
                        document.getElementById("rewardToday1").remove();
                        document.getElementById("carAudit1").remove();

                        document.getElementsByTag("title").get(0).text(1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified");
                        Element driver_audit1_user = document.getElementById("driver_audit1_user");
                        driver_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
                        Element driver_audit1_content = document.getElementById("driver_audit1_content");
                        if(1 == authState){
                            driver_audit1_content.text("You application has been approved.");
                            driver_audit1_content.text("Your application has been approved.");
                        }else{
                            driver_audit1_content.text("I'm sorry, your application was rejected. Reason for rejection: Incomplete filling in personal information.");
                            driver_audit1_content.text("We are sorry to inform you that your application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
                        }
                        EmailUtil.send(tDriver.getEmail(), "Notice of driver registration application",  document.html());
                        EmailUtil.send(tDriver.getEmail(), 1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified",  document.html());
                    }catch (Exception e){
                        e.printStackTrace();
                    }
@@ -709,6 +712,11 @@
        }
        tDriver.setPhone(phone);
        tDriver.setAccount(phone);
        tDriver.setBalance(new BigDecimal(0));
//        tDriver.setCommission(new BigDecimal(0));
//        tDriver.setCouponBalance(new BigDecimal(0));
//        tDriver.setBackgroundBalance(new BigDecimal(0));

        tDriverService.insert(tDriver);

        //添加经营业务
@@ -761,6 +769,7 @@
        tDriverService.updateById(driver);
        return SUCCESS_TIP;
    }
    
    /**
     * 操作司机状态
     */
@@ -772,6 +781,10 @@
            if (1 == optType){  //解冻
                tDriver.setAuthState(2);
            }else if (2 == optType){  //冻结
                String token = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
                redisUtil.remove(token);//删除个人信息数据
                redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
                redisUtil.remove("DRIVER_" + driverId);//清除存储的token
                tDriver.setAuthState(3);
            }
            tDriver.setRemark(remark);
@@ -1879,8 +1892,8 @@
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("name"))){
                shellList.add(object.get("name").toString());
            if(SinataUtil.isNotEmpty(object.get("firstName"))){
                shellList.add(object.get("firstName").toString() + " " + object.get("lastName").toString());
            }else{
                shellList.add("-");
            }
@@ -1890,7 +1903,7 @@
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("sex"))){
                shellList.add(object.get("sex").toString() == "1"?"男":"女");
                shellList.add(object.get("sex").toString().equals("1")?"男":"女");
            }else{
                shellList.add("-");
            }
@@ -1957,8 +1970,6 @@
            }
            if(SinataUtil.isNotEmpty(object.get("authState"))){
                shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));

                shellList.add(object.get("authState").toString());
            }else{
                shellList.add("-");
            }