新增加字段

puzhibing

2025-06-16 54af05ded609f2148e1fabfb1b22b553d71f1bcb

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;

@@ -55,18 +56,18 @@
    @Override
    public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11) {
        //判断id是否为空，为空执行添加，或者执行修改
        if(id==null){
        if(id==null) {
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);
            Date endTimes = DateUtil.getDate_str3(timeArray[1]);
            ShiroUser user = ShiroKit.getUser();
            ShiroUser user = ShiroExtUtil.getUser();
            Date nowDay = new Date();
            //添加活动
            DriverActivity driverActivity = new DriverActivity();
            driverActivity.setInsertTime(nowDay);
            driverActivity.setCompanyId(ShiroKit.getUser().getObjectId());
            driverActivity.setCompanyType(ShiroKit.getUser().getRoleType());
            driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1);
            driverActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            driverActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            driverActivity.setStatus(driverActivity.getCompanyType() == 1 ? 3 : 1);
            driverActivity.setName(num1);
            driverActivity.setStartTime(startTimes);
            driverActivity.setEndTime(endTimes);
@@ -136,27 +137,27 @@
            driverActivityRegistered.setType(2);
            driverActivityRegistered.setMoney(num3);
            driverActivityRegistered.insertOrUpdate();
        }else{
        }else {
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);
            Date endTimes = DateUtil.getDate_str3(timeArray[1]);
            ShiroUser user = ShiroKit.getUser();

            ShiroUser user = ShiroExtUtil.getUser();
    
            Date nowDay = new Date();
            //添加活动
            DriverActivity driverActivity = new DriverActivity();
            driverActivity.setId(id);
            driverActivity.setCompanyId(ShiroKit.getUser().getObjectId());
            driverActivity.setCompanyType(ShiroKit.getUser().getRoleType());
            driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1);
            driverActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            driverActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            driverActivity.setStatus(driverActivity.getCompanyType() == 1 ? 3 : 1);
            driverActivity.setName(num1);
            driverActivity.setStartTime(startTimes);
            driverActivity.setEndTime(endTimes);
            driverActivity.insertOrUpdate();

    
            //添加在线活动-快车
            DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
            if(driverActivityOnline==null){
            DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId", id).eq("type", 1));
            if (driverActivityOnline == null) {
                driverActivityOnline = new DriverActivityOnline();
                driverActivityOnline.setInsertTime(nowDay);
            }